diff --git a/pkgs/applications/editors/emacs-modes/cedet/default.nix b/pkgs/applications/editors/emacs-modes/cedet/default.nix
new file mode 100644
index 00000000000..a6dd9ecb661
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/cedet/default.nix
@@ -0,0 +1,60 @@
+{ fetchurl, stdenv, emacs }:
+
+stdenv.mkDerivation rec {
+  name = "cedet-1.0pre4";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/cedet/${name}.tar.gz";
+    sha256 = "0r1cvik8drbx4if3a54xla7l31gcqwb44rqqgfqdvwg5wzcd5slv";
+  };
+
+  buildInputs = [ emacs ];
+
+  # FIXME: EIEIO tests fail with:
+  # eieio-tests.el:474:1:Error: Symbol's value as variable is void: class-typep-var
+  # See http://thread.gmane.org/gmane.emacs.eieio/72 .
+  doCheck = false;
+  checkPhase = ''
+    for dir in *
+    do
+      if [ -f "$dir/Makefile" ] && grep -q "test:" "$dir/Makefile"
+      then
+        echo "testing \`$dir'..."
+        make test -C "$dir"
+      fi
+    done
+  '';
+
+  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* */*/*.info* "$out/share/info"
+  '';
+
+  meta = {
+    description = "CEDET, a Collection of Emacs Development Environment Tools";
+
+    longDescription = ''
+      CEDET is a collection of tools written with the end goal of
+      creating an advanced development environment in Emacs.
+
+      Emacs already is a great environment for writing software, but
+      there are additional areas that need improvement.  Many new
+      ideas for integrated environments have been developed in newer
+      products, such as JBuilder, Eclipse, or KDevelop.  CEDET is a
+      project which brings together several different tools needed to
+      implement advanced features.
+
+      CEDET includes EIEIO (Enhanced Implementation of Emacs
+      Interpreted Objects), Semantic, SRecode, Speedbar, EDE (Emacs
+      Development Environment), and COGRE (COnnected GRaph Editor).
+    '';
+
+    license = "GPLv2+";
+
+    homepage = http://cedet.sourceforge.net/;
+  };
+}
diff --git a/pkgs/applications/editors/emacs-modes/eieio/default.nix b/pkgs/applications/editors/emacs-modes/eieio/default.nix
index bbe4c6085ac..436b71022fc 100644
--- a/pkgs/applications/editors/emacs-modes/eieio/default.nix
+++ b/pkgs/applications/editors/emacs-modes/eieio/default.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
     description = "EIEIO: Enhanced Implementation of Emacs Interpreted Objects";
 
     longDescription = ''
+      This package is now part of CEDET, please upgrade.
+
       EIEIO is a package which implements a CLOS subset for Emacs.  It
       includes examples which can draw simple tree graphs, and bar
       charts.
diff --git a/pkgs/applications/editors/emacs-modes/semantic/default.nix b/pkgs/applications/editors/emacs-modes/semantic/default.nix
index dfb1902c1c2..0ff6392472b 100644
--- a/pkgs/applications/editors/emacs-modes/semantic/default.nix
+++ b/pkgs/applications/editors/emacs-modes/semantic/default.nix
@@ -30,6 +30,8 @@ stdenv.mkDerivation rec {
     description = "Semantic, infrastructure for parser based text analysis in Emacs";
 
     longDescription = ''
+      This package is now part of CEDET, please upgrade.
+
       Semantic is an infrastructure for parser based text analysis in
       Emacs.  It is a lexer, parser-generator, and parser.  It is
       written in Emacs Lisp and is customized to the way Emacs thinks
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74f36f5431e..4ff02cd139c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -499,6 +499,10 @@ let
     inherit fetchurl stdenv cmake libcap zlib bzip2;
   };
 
+  cedet = import ../applications/editors/emacs-modes/cedet {
+    inherit fetchurl stdenv emacs;
+  };
+
   checkinstall = import ../tools/package-management/checkinstall {
     inherit fetchurl stdenv gettext;
   };