diff --git a/pkgs/applications/editors/emacs-modes/apel/default.nix b/pkgs/applications/editors/emacs-modes/apel/default.nix
new file mode 100644
index 00000000000..7036dc3bcc5
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/apel/default.nix
@@ -0,0 +1,25 @@
+{stdenv, fetchgit, emacs}:
+
+stdenv.mkDerivation rec {
+  name = "apel-git";
+
+  src = fetchgit {
+    url = "http://github.com/wanderlust/apel";
+    rev = "beca6c4fc58fdc0f8923b320265ec5a304850f50";
+  };
+
+  buildInputs = [emacs];
+
+  preConfigure = ''
+    cat << EOF > APEL-CFG
+    (setq APEL_DIR "$out/share/emacs/site-lisp/apel")
+    (setq EMU_DIR "$out/share/emacs/site-lisp/emu")
+    EOF
+  '';
+
+  meta = {
+    description = "APEL";
+    homepage = http://nya.org/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/flim/default.nix b/pkgs/applications/editors/emacs-modes/flim/default.nix
new file mode 100644
index 00000000000..1da221a4b1b
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/flim/default.nix
@@ -0,0 +1,30 @@
+{stdenv, fetchgit, emacs, apel}:
+
+stdenv.mkDerivation rec {
+  name = "flim-git";
+
+  src = fetchgit {
+    url = "http://github.com/wanderlust/flim";
+    rev = "d435c3626d2e07cc62f084930b6d5eca66f6768c";
+  };
+
+  buildInputs = [emacs apel];
+
+  preConfigure = ''
+    cat << EOF > FLIM-CFG
+    (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel")
+    (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu")
+    (require 'install)
+    (setq PREFIX "$out/share")
+    (setq LISPDIR "$out/share/emacs/site-lisp")
+    (setq FLIM_DIR "$out/share/emacs/site-lisp/flim")
+    EOF
+    cat FLIM-CFG
+  '';
+
+  meta = {
+    description = "FLIM";
+    homepage = http://nya.org/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/semi/default.nix b/pkgs/applications/editors/emacs-modes/semi/default.nix
new file mode 100644
index 00000000000..43e184608d9
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/semi/default.nix
@@ -0,0 +1,33 @@
+{stdenv, fetchgit, emacs, apel, flim}:
+
+stdenv.mkDerivation rec {
+  name = "semi-git";
+
+  src = fetchgit {
+    url = "http://github.com/wanderlust/semi";
+    rev = "e81b1ec56a5d2c8ae352df1cd6a7eaa2532097f0";
+  };
+
+  buildInputs = [emacs apel flim];
+
+  preConfigure = ''
+    cat << EOF > SEMI-CFG
+    (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel")
+    (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu")
+    (add-to-list 'load-path "${flim}/share/emacs/site-lisp/flim")
+    (require 'install)
+    (setq PREFIX "$out")
+    (setq METHOD_DIR "$out/share/semi")
+    (setq LISPDIR "$out/share/emacs/site-lisp")
+    (setq SEMI_KERNEL_DIR "$out/share/emacs/site-lisp/semi")
+    (setq SETUP_FILE_DIR "$out/share/emacs/site-lisp/semi")
+    EOF
+    cat SEMI-CFG
+  '';
+
+  meta = {
+    description = "SEMI";
+    homepage = http://nya.org/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/wanderlust/default.nix b/pkgs/applications/editors/emacs-modes/wanderlust/default.nix
new file mode 100644
index 00000000000..0ee49bef161
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/wanderlust/default.nix
@@ -0,0 +1,31 @@
+{stdenv, fetchgit, emacs, apel, flim, semi}:
+
+stdenv.mkDerivation rec {
+  name = "wanderlust-git";
+
+  src = fetchgit {
+    url = "http://github.com/wanderlust/wanderlust";
+    rev = "5e1ccbda73e29657fc05dc05aa9717eff02fdf71";
+  };
+
+  buildInputs = [emacs apel flim semi];
+
+  preConfigure = ''
+    cat << EOF > WL-CFG
+    (add-to-list 'load-path "${apel}/share/emacs/site-lisp/apel")
+    (add-to-list 'load-path "${apel}/share/emacs/site-lisp/emu")
+    (add-to-list 'load-path "${flim}/share/emacs/site-lisp/flim")
+    (add-to-list 'load-path "${semi}/share/emacs/site-lisp/semi")
+    (require 'install)
+    (setq LISPDIR "$out/share/emacs/site-lisp")
+    (setq PIXMAPDIR (concat "$out/share/emacs/" emacs-version "/etc/wl/icons"))
+    EOF
+    cat WL-CFG
+  '';
+
+  meta = {
+    description = "wanderlust";
+    homepage = http://nya.org/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fba5857cfb4..690ff3851e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10018,6 +10018,8 @@ let
 
     autoComplete = callPackage ../applications/editors/emacs-modes/auto-complete { };
 
+    apel = callPackage ../applications/editors/emacs-modes/apel { };
+
     bbdb = callPackage ../applications/editors/emacs-modes/bbdb { };
 
     bbdb3 = callPackage ../applications/editors/emacs-modes/bbdb/3.nix {};
@@ -10056,6 +10058,8 @@ let
 
     ess = callPackage ../applications/editors/emacs-modes/ess { };
 
+    flim = callPackage ../applications/editors/emacs-modes/flim { };
+
     flycheck = callPackage ../applications/editors/emacs-modes/flycheck { };
 
     flymakeCursor = callPackage ../applications/editors/emacs-modes/flymake-cursor { };
@@ -10147,6 +10151,8 @@ let
 
     sbtMode = callPackage ../applications/editors/emacs-modes/sbt-mode { };
 
+    semi = callPackage ../applications/editors/emacs-modes/semi { };
+
     scalaMode1 = callPackage ../applications/editors/emacs-modes/scala-mode/v1.nix { };
     scalaMode2 = callPackage ../applications/editors/emacs-modes/scala-mode/v2.nix { };
 
@@ -10161,6 +10167,8 @@ let
 
     tuaregMode = callPackage ../applications/editors/emacs-modes/tuareg { };
 
+    wanderlust = callPackage ../applications/editors/emacs-modes/wanderlust { };
+
     writeGood = callPackage ../applications/editors/emacs-modes/writegood { };
 
     xmlRpc = callPackage ../applications/editors/emacs-modes/xml-rpc { };