diff --git a/pkgs/applications/editors/emacs-modes/org/default.nix b/pkgs/applications/editors/emacs-modes/org/default.nix
new file mode 100644
index 000000000000..31efaf8de238
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/org/default.nix
@@ -0,0 +1,41 @@
+{ fetchurl, stdenv, emacs, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "org-7.01f";
+
+  src = fetchurl {
+    url = "http://orgmode.org/${name}.tar.gz";
+    sha256 = "1db7s57g8gh8w0464n18lxpcz270x9ns63b2blhkz8wrdnk57fia";
+  };
+
+  buildInputs = [ emacs texinfo ];
+
+  configurePhase =
+    '' sed -i Makefile \
+           -e "s|^prefix=.*$|prefix=$out|g"
+    '';
+
+  installPhase =
+    '' make install install-info
+
+       ensureDir "$out/share/doc/${name}"
+       cp -v doc/orgcard*.{pdf,txt} "$out/share/doc/${name}"
+    '';
+
+  meta = {
+    description = "Org-Mode, an Emacs mode for notes, project planning, and authoring";
+
+    longDescription =
+      '' Org-mode is for keeping notes, maintaining ToDo lists, doing project
+         planning, and authoring with a fast and effective plain-text system.
+
+         This package contains a version of Org-mode typically more recent
+         than that found in GNU Emacs.
+      '';
+
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b08e04b792ef..2fd8dbe145a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7838,6 +7838,10 @@ let
       inherit fetchurl stdenv;
     };
 
+    org = import ../applications/editors/emacs-modes/org {
+      inherit fetchurl stdenv emacs texinfo;
+    };
+
     prologMode = import ../applications/editors/emacs-modes/prolog {
       inherit fetchurl stdenv;
     };