diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix
index 8373ed25d24..c41474b39b6 100644
--- a/pkgs/development/libraries/neon/0.28.nix
+++ b/pkgs/development/libraries/neon/0.28.nix
@@ -9,12 +9,12 @@ assert compressionSupport -> zlib != null;
 assert sslSupport -> openssl != null;
 assert static || shared;
 
-stdenv.mkDerivation {
-  name = "neon-0.28.3";
+stdenv.mkDerivation rec {
+  name = "neon-0.28.6";
 
   src = fetchurl {
-    url = http://www.webdav.org/neon/neon-0.28.3.tar.gz;
-    sha256 = "1hnd9wlbnfpppx6rvalhdkc1rf29afacl1m15z751g3h9hdybplh";
+    url = "http://www.webdav.org/neon/${name}.tar.gz";
+    sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6";
   };
 
   buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
diff --git a/pkgs/os-specific/linux/davfs2/default.nix b/pkgs/os-specific/linux/davfs2/default.nix
deleted file mode 100644
index b4acc96f208..00000000000
--- a/pkgs/os-specific/linux/davfs2/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{stdenv, fetchurl, neon, zlib}:
-
-stdenv.mkDerivation rec {
-  name = "davfs2-1.4.1";
-
-  src = fetchurl {
-    url = "http://www.very-clever.com/download/nongnu/davfs2/${name}.tar.gz";
-    sha256 = "0fqq331rd3ylzfhdsbbj0b2znn3d0js0kxcv3w54dl9g2cs8fqhn";
-  };
-
-  buildInputs = [ neon zlib ]; 
-  patches = [ ./davfs2-install.patch ]; 
-
-  meta = {
-    description = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";
-
-    license = "GPLv3+";
-    homepage = http://savannah.nongnu.org/projects/davfs2;
-  };
-}
diff --git a/pkgs/os-specific/linux/davfs2/davfs2-install.patch b/pkgs/tools/filesystems/davfs2/davfs2-install.patch
similarity index 100%
rename from pkgs/os-specific/linux/davfs2/davfs2-install.patch
rename to pkgs/tools/filesystems/davfs2/davfs2-install.patch
diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix
new file mode 100644
index 00000000000..1d5f6d8ffcd
--- /dev/null
+++ b/pkgs/tools/filesystems/davfs2/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, neon, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "davfs2-1.4.5";
+
+  src = fetchurl {
+    url = "mirror://savannah/davfs2/${name}.tar.gz";
+    sha256 = "1pkl2braggp2qg4c68dwfv399l9jz7cvi7gkm4xbj6mgvl0cxw18";
+  };
+
+  buildInputs = [ neon zlib ];
+  
+  patches = [ ./davfs2-install.patch ]; 
+
+  meta = {
+    longDescription = "Web Distributed Authoring and Versioning (WebDAV), an extension to the HTTP-protocol, allows authoring of resources on a remote web server. davfs2 provides the ability to access such resources like a typical filesystem, allowing for use by standard applications with no built-in support for WebDAV.";
+
+    license = "GPLv3+";
+    homepage = http://savannah.nongnu.org/projects/davfs2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b94be6df33..13335494d37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -519,6 +519,11 @@ let
     inherit fetchurl stdenv zlib bzip2 openssl;
   };
 
+  davfs2 = import ../tools/filesystems/davfs2 {
+    inherit fetchurl stdenv zlib;
+    neon = neon028;
+  };
+
   dcraw = import ../tools/graphics/dcraw {
     inherit fetchurl stdenv gettext libjpeg lcms;
   };
@@ -5200,11 +5205,6 @@ let
     inherit stdenv;
   };
 
-  davfs2 = import ../os-specific/linux/davfs2 {
-    inherit fetchurl stdenv zlib;
-    neon = neon028;
-  };
-
   devicemapper = import ../os-specific/linux/device-mapper {
     inherit fetchurl stdenv;
   };