diff --git a/pkgs/development/python-modules/yowsup/argparse-dependency.patch b/pkgs/development/python-modules/yowsup/argparse-dependency.patch
new file mode 100644
index 00000000000..364f0054fe7
--- /dev/null
+++ b/pkgs/development/python-modules/yowsup/argparse-dependency.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index 053ed07..60f0d9a 100755
+--- a/setup.py
++++ b/setup.py
+@@ -5,7 +5,7 @@ import yowsup
+ import platform
+ import sys
+ 
+-deps = ['python-dateutil', 'argparse', 'python-axolotl>=0.1.39', 'six']
++deps = ['python-dateutil', 'python-axolotl>=0.1.39', 'six']
+ 
+ if sys.version_info < (2,7):
+     deps += ['importlib']
diff --git a/pkgs/development/python-modules/yowsup/default.nix b/pkgs/development/python-modules/yowsup/default.nix
new file mode 100644
index 00000000000..fce974ccd3a
--- /dev/null
+++ b/pkgs/development/python-modules/yowsup/default.nix
@@ -0,0 +1,30 @@
+{ buildPythonPackage, stdenv, fetchFromGitHub, six, python-axolotl, pytest }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "yowsup";
+  version = "2.5.2";
+
+  src = fetchFromGitHub {
+    owner = "tgalal";
+    repo = "yowsup";
+    rev = "v${version}";
+    sha256 = "16l8jmr32wwvl11m0a4r4id3dkfqj2n7dn6gky1077xwmj2da4fl";
+  };
+
+  checkInputs = [ pytest ];
+  checkPhase = ''
+    HOME=$(mktemp -d) py.test yowsup
+  '';
+
+  patches = [ ./argparse-dependency.patch ];
+
+  propagatedBuildInputs = [ six python-axolotl ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/tgalal/yowsup";
+    description = "The python WhatsApp library";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ ma27 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index facb6eb25b3..5c2b10003ca 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26537,6 +26537,8 @@ EOF
     };
   };
 
+  yowsup = callPackage ../development/python-modules/yowsup { };
+
   wptserve = callPackage ../development/python-modules/wptserve { };
 
   yenc = callPackage ../development/python-modules/yenc { };