diff --git a/pkgs/applications/editors/emacs-modes/org-packages.nix b/pkgs/applications/editors/emacs-modes/org-packages.nix
new file mode 100644
index 00000000000..b8543841a7f
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/org-packages.nix
@@ -0,0 +1,37 @@
+/*
+
+# Updating
+
+To update the list of packages from ELPA,
+
+1. Clone https://github.com/ttuegel/emacs2nix
+2. Run `./org-packages.sh` from emacs2nix
+3. Copy the new org-packages.json file into Nixpkgs
+4. `git commit -m "org-packages $(date -Idate)"`
+
+*/
+
+{ fetchurl, lib, stdenv, texinfo }:
+
+self:
+
+  let
+
+    imported = import ./org-generated.nix {
+      inherit (self) callPackage;
+    };
+
+    super = imported;
+
+    markBroken = pkg: pkg.override {
+      elpaBuild = args: self.elpaBuild (args // {
+        meta = (args.meta or {}) // { broken = true; };
+      });
+    };
+
+    overrides = {
+    };
+
+    orgPackages = super // overrides;
+
+  in orgPackages // { inherit orgPackages; }
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 3407a92e6a0..f70f6c37b9b 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -59,6 +59,10 @@ let
     inherit lib;
   };
 
+  orgPackages = import ../applications/editors/emacs-modes/org-packages.nix {
+    inherit fetchurl lib stdenv texinfo;
+  };
+
   emacsWithPackages = import ../build-support/emacs/wrapper.nix {
     inherit lib lndir makeWrapper stdenv;
   };
@@ -1299,19 +1303,6 @@ let
     };
   };
 
-  org-plus-contrib = elpaBuild rec {
-    pname   = "org-plus-contrib";
-    version = "20150406";
-    src = fetchurl {
-      url    = "http://orgmode.org/elpa/${pname}-${version}.tar";
-      sha256 = "1ny2myg4rm75ab2gl5rqrwy7h53q0vv18df8gk3zv13kljj76c6i";
-    };
-    meta = {
-      description = "Notes, TODO lists, projects, and authoring in plain-text with Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   org-trello = melpaBuild rec {
     pname = "org-trello";
     version = "0.7.5";
@@ -1843,5 +1834,6 @@ in
     // melpaPackages self
     // elpaPackages self
     // melpaStablePackages self
+    // orgPackages self
     // packagesFun self
   )