diff --git a/pkgs/applications/editors/emacs-modes/bbdb/builder.sh b/pkgs/applications/editors/emacs-modes/bbdb/builder.sh
new file mode 100644
index 000000000000..3828080b16ec
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/bbdb/builder.sh
@@ -0,0 +1,7 @@
+source "$stdenv/setup"
+
+unpackPhase &&						\
+cd bbdb-*.* &&						\
+./configure --prefix="$out"				\
+            --with-package-dir="$out/lib/site-emacs" &&	\
+make && make install-pkg
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
new file mode 100644
index 000000000000..4b485d90e3f0
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, emacs, texinfo, ctags}:
+
+stdenv.mkDerivation {
+  name = "bbdb-2.35";
+
+  src = fetchurl {
+    url = http://bbdb.sourceforge.net/bbdb-2.35.tar.gz;
+    sha256 = "3fb1316e2ed74d47ca61187fada550e58797467bd9e8ad67343ed16da769f916";
+  };
+
+  buildInputs = [emacs texinfo ctags];
+
+  builder = ./builder.sh;
+
+  meta = {
+    description = ''The Insidious Big Brother Database (BBDB), a
+                    contact management utility for Emacs.'';
+    homepage = http://bbdb.sourceforge.net/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f22c500a63c1..cc3049799bba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4448,6 +4448,10 @@ rec {
     inherit (gtkLibs) gtk;
   };
 
+  bbdb = import ../applications/editors/emacs-modes/bbdb {
+    inherit fetchurl stdenv emacs texinfo ctags;
+  };
+
   cua = import ../applications/editors/emacs-modes/cua {
     inherit fetchurl stdenv;
   };