diff --git a/pkgs/applications/editors/emacs-modes/apel/default.nix b/pkgs/applications/editors/emacs-modes/apel/default.nix
deleted file mode 100644
index 7036dc3bcc5b..000000000000
--- a/pkgs/applications/editors/emacs-modes/apel/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{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
deleted file mode 100644
index 1da221a4b1bb..000000000000
--- a/pkgs/applications/editors/emacs-modes/flim/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{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
deleted file mode 100644
index 43e184608d9b..000000000000
--- a/pkgs/applications/editors/emacs-modes/semi/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{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
deleted file mode 100644
index 0ee49bef1610..000000000000
--- a/pkgs/applications/editors/emacs-modes/wanderlust/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{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 deb0d0483c4e..c0acbf53e8ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10014,8 +10014,6 @@ 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 {};
@@ -10054,8 +10052,6 @@ 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,8 +10143,6 @@ 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 { };
 
@@ -10163,8 +10157,6 @@ 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 { };
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 8dac3fa52df3..86ae2157864d 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -114,6 +114,29 @@ let self = _self // overrides;
     };
   };
 
+  apel = melpaBuild rec {
+    pname = "apel";
+    version = "10.8";
+    src = fetchFromGitHub {
+      owner  = "wanderlust";
+      repo   = pname;
+      rev    = "8402e59eadb580f59969114557b331b4d9364f95";
+      sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
+    };
+    files = [
+      "alist.el" "apel-ver.el" "broken.el" "calist.el"
+      "emu.el" "filename.el" "install.el" "inv-23.el" "invisible.el"
+      "mcharset.el" "mcs-20.el" "mcs-e20.el" "mule-caesar.el"
+      "path-util.el" "pccl-20.el" "pccl.el" "pces-20.el" "pces-e20.el"
+      "pces.el" "pcustom.el" "poe.el" "poem-e20.el" "poem-e20_3.el"
+      "poem.el" "product.el" "pym.el" "richtext.el" "static.el"
+    ];
+    meta = {
+      description = "A Portable Emacs Library";
+      license = gpl3Plus; # probably
+    };
+  };
+
   async = melpaBuild rec {
     pname   = "async";
     version = "1.2";
@@ -324,6 +347,22 @@ let self = _self // overrides;
     meta = { licence = gpl3Plus; };
   };
 
+  flim = melpaBuild rec {
+    pname = "flim";
+    version = "1.14.9"; # 20141216
+    src = fetchFromGitHub {
+      owner  = "wanderlust";
+      repo   = pname;
+      rev    = "488a4d70fb4ae57bdd30dc75c2d75579894e28a2";
+      sha256 = "178fhpbyffksr4v3m8jmx4rx2vqyz23qhbyvic5afabxi6lahjfs";
+    };
+    packageRequires = [ apel ];
+    meta = {
+      description = "Email message encoding library for Emacs";
+      license = gpl3Plus; # probably
+    };
+  };
+
   flycheck-pos-tip = melpaBuild rec {
     pname   = "flycheck-pos-tip";
     version = "20140813";
@@ -671,6 +710,22 @@ let self = _self // overrides;
     meta = { licence = gpl3Plus; };
   };
 
+  semi = melpaBuild rec {
+    pname = "semi";
+    version = "1.14.7"; # 20150203
+    src = fetchFromGitHub {
+      owner  = "wanderlust";
+      repo   = pname;
+      rev    = "9976269556c5bcc021e4edf1b0e1accd39929528";
+      sha256 = "1g1xg57pz4msd3f998af5gq28qhmvi410faygzspra6y6ygaka68";
+    };
+    packageRequires = [ apel flim ];
+    meta = {
+      description = "MIME library for Emacs";
+      license = gpl3Plus; # probably
+    };
+  };
+
   shorten = melpaBuild rec {
     pname   = "shorten";
     version = "1.5";
@@ -804,6 +859,27 @@ let self = _self // overrides;
     meta = { licence = gpl3Plus; };
   };
 
+  wanderlust = melpaBuild rec {
+    pname = "wanderlust";
+    version = "2.15.9"; # 20150301
+    src = fetchFromGitHub {
+      owner  = pname;
+      repo   = pname;
+      rev    = "13fb4f6519490d4ac7138f3bcf76707654348071";
+      sha256 = "1l48xfcwkm205prspa1rns6lqfizik5gpdwmlfgyb5mabm9x53zn";
+    };
+    packageRequires = [ apel flim semi ];
+    fileSpecs = [
+      "doc/wl.texi" "doc/wl-ja.texi"
+      "elmo/*.el" "wl/*.el"
+      "etc/icons"
+    ];
+    meta = {
+      description = "E-Mail client for Emacs";
+      license = gpl3Plus; # probably
+    };
+  };
+
   weechat = melpaBuild rec {
     pname   = "weechat.el";
     version = "20141016";