diff --git a/pkgs/applications/editors/emacs-modes/eieio/default.nix b/pkgs/applications/editors/emacs-modes/eieio/default.nix
new file mode 100644
index 00000000000..bbe4c6085ac
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/eieio/default.nix
@@ -0,0 +1,38 @@
+{ fetchurl, stdenv, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "eieio-0.17";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cedet/${name}.tar.gz";
+    sha256 = "0n31z9d47ar10g9xrnzz3nl4pmixw1nkk0kpxaillls7xvjd1zy2";
+  };
+
+  buildInputs = [ emacs ];
+
+  doCheck = false;
+  checkPhase = "make test";
+
+  installPhase = ''
+    ensureDir "$out/share/emacs/site-lisp"
+    cp -v *.el *.elc "$out/share/emacs/site-lisp"
+    chmod a-x "$out/share/emacs/site-lisp/"*
+
+    ensureDir "$out/share/info"
+    cp -v *.info* "$out/share/info"
+  '';
+
+  meta = {
+    description = "EIEIO: Enhanced Implementation of Emacs Interpreted Objects";
+
+    longDescription = ''
+      EIEIO is a package which implements a CLOS subset for Emacs.  It
+      includes examples which can draw simple tree graphs, and bar
+      charts.
+    '';
+
+    license = "GPLv2+";
+
+    homepage = http://cedet.sourceforge.net/;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d43baef412..fe3a51f8e2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -691,6 +691,10 @@ let
     inherit fetchurl stdenv cdrkit m4;
   };
 
+  eieio = import ../applications/editors/emacs-modes/eieio {
+    inherit fetchurl stdenv emacs;
+  };
+
   enscript = import ../tools/text/enscript {
     inherit fetchurl stdenv;
   };