diff --git a/packages/dev-python/python-sipsimple/files/python-sipsimple-3.1.0-fix-build.patch b/packages/dev-python/python-sipsimple/files/python-sipsimple-3.1.0-fix-build.patch
new file mode 100644
index 00000000..871e23c1
--- /dev/null
+++ b/packages/dev-python/python-sipsimple/files/python-sipsimple-3.1.0-fix-build.patch
@@ -0,0 +1,45 @@
+From f786808a36deab01f301905ecdae27e6e17ce197 Mon Sep 17 00:00:00 2001
+From: Charles Barcza <info@blackpanther.hu>
+Date: Mon, 13 Mar 2017 14:46:34 +0100
+Subject: [PATCH 1/2] Build fix on Linux
+Upstream: submitted, https://github.com/AGProjects/python-sipsimple/pull/1
+
+---
+ setup_pjsip.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup_pjsip.py b/setup_pjsip.py
+index 4760e64..a43533d 100644
+--- a/setup_pjsip.py
++++ b/setup_pjsip.py
+@@ -157,6 +157,7 @@ def configure_pjsip(self):
+         if sys_platform == "win32":
+             cmd = ["bash", "configure"]
+         else:
++    	    os.system("chmod +x "+ self.build_dir +"/*configure")
+             cmd = ["./configure"]
+         cmd.extend(["--disable-g7221-codec"])
+         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)
+
+From b80cf7ee9d4c32b4e068eb74492f31ccab1296b2 Mon Sep 17 00:00:00 2001
+From: Charles Barcza <info@blackpanther.hu>
+Date: Mon, 13 Mar 2017 14:55:29 +0100
+Subject: [PATCH 2/2] Build fix on Linux
+
+---
+ setup_pjsip.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/setup_pjsip.py b/setup_pjsip.py
+index a43533d..5f1b27b 100644
+--- a/setup_pjsip.py
++++ b/setup_pjsip.py
+@@ -157,7 +157,7 @@ def configure_pjsip(self):
+         if sys_platform == "win32":
+             cmd = ["bash", "configure"]
+         else:
+-    	    os.system("chmod +x "+ self.build_dir +"/*configure")
++	    os.system("chmod +x "+ self.build_dir +"/*configure")
+             cmd = ["./configure"]
+         cmd.extend(["--disable-g7221-codec"])
+         ffmpeg_path = env.get("SIPSIMPLE_FFMPEG_PATH", None)
diff --git a/packages/dev-python/python-sipsimple/python-sipsimple-3.0.0-r1.exheres-0 b/packages/dev-python/python-sipsimple/python-sipsimple-3.1.0.exheres-0
similarity index 83%
rename from packages/dev-python/python-sipsimple/python-sipsimple-3.0.0-r1.exheres-0
rename to packages/dev-python/python-sipsimple/python-sipsimple-3.1.0.exheres-0
index 27ea1d3c..fefaf542 100644
--- a/packages/dev-python/python-sipsimple/python-sipsimple-3.0.0-r1.exheres-0
+++ b/packages/dev-python/python-sipsimple/python-sipsimple-3.1.0.exheres-0
@@ -1,11 +1,11 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require setup-py [ import=distutils blacklist="3" ]
+require github [ user="AGProjects" tag="release-${PV}" ]
+require setup-py [ import=distutils blacklist="3" work="${PN}-release-${PV}" ]
 
 SUMMARY="SIP SIMPLE client SDK is a Software Development Kit"
-HOMEPAGE="http://sipsimpleclient.org"
-DOWNLOADS="http://download.ag-projects.com/SipClient/${PNV}.tar.gz"
+HOMEPAGE="http://sipsimpleclient.org ${HOMEPAGE}"
 
 LICENCES="GPL-3"
 SLOT="0"
@@ -39,13 +39,17 @@ DEPENDENCIES="
         dev-python/python-eventlib[python_abis:*(-)?]
         dev-python/python-gnutls[python_abis:*(-)?]
         dev-python/python-msrplib[>=0.19.0][python_abis:*(-)?]
-        dev-python/python-otr[python_abis:*(-)?]
+        dev-python/python-otr[>=1.2.0][python_abis:*(-)?]
         dev-python/python-xcaplib[python_abis:*(-)?]
         dev-python/zopeinterface[python_abis:*(-)?]
         media-libs/x264[-10bit]
         net-twisted/TwistedCore[python_abis:*(-)?]
 "
 
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}"/${PNV}-fix-build.patch
+)
+
 src_compile() {
     # breaks horribly with 'ld'
     export LD=${CC}