diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
new file mode 100644
index 00000000000..3978461d0ca
--- /dev/null
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, python, fetchurl, openssl, boost }:
+stdenv.mkDerivation rec {
+  name    = "swiften-${version}";
+  version = "3.0beta2";
+
+  buildInputs           = [ python ];
+  propagatedBuildInputs = [ openssl boost ];
+
+  src = fetchurl {
+    url    = "http://swift.im/downloads/releases/swift-${version}/swift-${version}.tar.gz";
+    sha256 = "0i6ks122rry9wvg6qahk3yiggi7nlkpgws1z0r41vi4i1siq0ls0";
+  };
+  
+  buildPhase = ''
+    ./scons openssl=${openssl} \
+            boost_includedir=${boost.dev}/include \
+            boost_libdir=${boost.lib}/lib \
+            boost_bundled_enable=false \
+            SWIFTEN_INSTALLDIR=$out $out
+  '';
+  installPhase = "true";
+
+  meta = with stdenv.lib; {
+    description = "An XMPP library for C++, used by the Swift client";
+    homepage    = http://swift.im/swiften.html;
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = [ maintainers.twey ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b83861392fa..7d5108658d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3110,6 +3110,8 @@ let
 
   swaks = callPackage ../tools/networking/swaks { };
 
+  swiften = callPackage ../development/libraries/swiften { };
+
   t = callPackage ../tools/misc/t { };
 
   t1utils = callPackage ../tools/misc/t1utils { };