2 files changed, 3 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 243bed1fd86e..3819eb33bba3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Sun May 29 06:53:25 UTC 2016
+# Sun May 29 08:29:51 UTC 2016
 pkgbase = python-proxyenv-git
 	pkgdesc = A python module to create a HTTP proxy in a docker container and use it
 	pkgver = .r24.a790e3a
@@ -14,6 +14,7 @@ pkgbase = python-proxyenv-git
 	depends = python-htpasswd-git
 	provides = python-proxyenv
 	conflicts = python-proxyenv
+	conflicts = python2-proxyenv-git
 	source = git+https://github.com/mwilck/proxyenv.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 43ff9a97d10e..4a371054c30d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ source=('git+https://github.com/mwilck/proxyenv.git')
 sha256sums=('SKIP')
 makedepends=('git' 'python-setuptools')
 provides=('python-proxyenv')
-conflicts=('python-proxyenv')
+conflicts=('python-proxyenv' 'python2-proxyenv-git')
 
 pkgver() {
   cd proxyenv