diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index defba390cf14..c076e66f0e6f 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,28 +1,28 @@
-{stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
+{ stdenv, fetchurl, zlib, python ? null, pythonSupport ? true }:
 
 assert pythonSupport -> python != null;
 
-stdenv.mkDerivation {
-  name = "libxml2-2.7.8";
+stdenv.mkDerivation rec {
+  name = "libxml2-2.9.0";
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz;
-    sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54";
+    url = "ftp://xmlsoft.org/libxml2/${name}.tar.gz";
+    sha256 = "10ib8bpar2pl68aqksfinvfmqknwnk7i35ibq6yjl8dpb0cxj9dd";
   };
 
-  configureFlags = ''                                                  
-    ${if pythonSupport then "--with-python=${python}" else ""}         
-  '';
-  
-  propagatedBuildInputs = [zlib];
+  configureFlags = stdenv.lib.optionalString pythonSupport "--with-python=${python}";
+
+  propagatedBuildInputs = [ zlib ];
 
   setupHook = ./setup-hook.sh;
 
-  passthru = {inherit pythonSupport;};
+  passthru = { inherit pythonSupport; };
 
   meta = {
     homepage = http://xmlsoft.org/;
     description = "A XML parsing library for C";
     license = "bsd";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.platforms.eelco ];
   };
 }
diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh
index d87c226506a8..f8e4f5e0fd64 100644
--- a/pkgs/development/libraries/libxml2/setup-hook.sh
+++ b/pkgs/development/libraries/libxml2/setup-hook.sh
@@ -1,10 +1,10 @@
 addXMLCatalogs () {
     for kind in dtd xsl; do
-	if test -d $1/xml/$kind; then
+        if test -d $1/xml/$kind; then
             for i in $(find $1/xml/$kind -name catalog.xml); do
-		export XML_CATALOG_FILES="$XML_CATALOG_FILES $i"
+                export XML_CATALOG_FILES="$XML_CATALOG_FILES $i"
             done
-	fi
+        fi
     done
 }
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 3b0a015d6b47..9e17ca7dbce6 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -170,7 +170,6 @@ with (import ./release-lib.nix);
   libsmbios = linux;
   libtool = all;
   libtool_2 = all;
-  libxml2 = all;
   libxslt = all;
   lout = linux;
   lsh = linux;