diff --git a/pkgs/development/python-modules/xcaplib/default.nix b/pkgs/development/python-modules/xcaplib/default.nix
new file mode 100644
index 00000000000..7dc67072046
--- /dev/null
+++ b/pkgs/development/python-modules/xcaplib/default.nix
@@ -0,0 +1,28 @@
+{ stdenv
+, buildPythonPackage
+, fetchdarcs
+, isPy3k
+, eventlib
+, application
+}:
+
+buildPythonPackage rec {
+  pname = "python-xcaplib";
+  version = "1.2.0";
+  disabled = isPy3k;
+
+  src = fetchdarcs {
+    url = "http://devel.ag-projects.com/repositories/${pname}";
+    rev = "release-${version}";
+    sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn";
+  };
+
+  propagatedBuildInputs = [ eventlib application ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/AGProjects/python-xcaplib;
+    description = "XCAP (RFC4825) client library";
+    license = licenses.gpl2;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 177e09f718c..bf5a706587a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4141,20 +4141,7 @@ in {
     wxGTK = pkgs.wxGTK30;
   };
 
-  xcaplib = buildPythonPackage rec {
-    pname = "python-xcaplib";
-    name = "${pname}-${version}";
-    version = "1.2.0";
-    disabled = isPy3k;
-
-    src = pkgs.fetchdarcs {
-      url = "http://devel.ag-projects.com/repositories/${pname}";
-      rev = "release-${version}";
-      sha256 = "0vna5r4ihv7z1yx6r93954jqskcxky77znzy1m9dg9vna1dgwfdn";
-    };
-
-    propagatedBuildInputs = with self; [ eventlib application ];
-  };
+  xcaplib = callPackage ../development/python-modules/xcaplib { };
 
   xlib = buildPythonPackage (rec {
     name = "xlib-${version}";