diff --git a/pkgs/applications/networking/instant-messengers/gaim/default.nix b/pkgs/applications/networking/instant-messengers/gaim/default.nix
index 1e867f66109b..36d63035e196 100644
--- a/pkgs/applications/networking/instant-messengers/gaim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gaim/default.nix
@@ -12,16 +12,16 @@
  * - audiofile-config
  * - doxygen
  */
-{stdenv, fetchurl, pkgconfig, glib, gtk, perl, libxml2, openssl, nss}:
+{stdenv, fetchurl, pkgconfig, glib, gtk, perl, perlXMLParser, libxml2, openssl, nss}:
 
 stdenv.mkDerivation {
-  name = "gaim-1.5.0";
+  name = "gaim-2.0.0pre6";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/gaim-1.5.0.tar.gz;
-    md5 = "dd984bd3116d8146545a492d314b0dae";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/gaim/gaim-2.0.0beta6.tar.gz;
+    md5 = "0c7520d4ce083704d196c04c63dcd16a";
   };
 
   inherit nss;
-  buildInputs = [pkgconfig glib gtk perl libxml2 openssl nss];
+  buildInputs = [pkgconfig glib gtk perl perlXMLParser libxml2 openssl nss];
 }
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
new file mode 100644
index 000000000000..e914391ea2f1
--- /dev/null
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, ncurses}:
+
+stdenv.mkDerivation {
+  name = "gdb-6.6";
+  src = fetchurl {
+    url = http://ftp.gnu.org/gnu/gdb/gdb-6.6.tar.bz2;
+    md5 = "a4df41d28dd514d64e8ccbfe125fd9a6";
+  };
+  buildInputs = [ncurses];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3b13ef9ad3c..3973709b1ff8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1171,6 +1171,10 @@ rec {
     uulib = uulib66;
   };
 
+  gdb = import ../development/tools/misc/gdb {
+    inherit fetchurl stdenv ncurses;
+  };
+
   valgrind = import ../development/tools/misc/valgrind {
     inherit fetchurl stdenv;
   };
@@ -2613,7 +2617,7 @@ rec {
   };
 
   gaim = import ../applications/networking/instant-messengers/gaim {
-    inherit fetchurl stdenv pkgconfig perl libxml2 openssl nss;
+    inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss;
     inherit (gtkLibs) glib gtk;
   };