diff -Nru ndg-httpsclient-0.4.0/debian/changelog ndg-httpsclient-0.4.0/debian/changelog
--- ndg-httpsclient-0.4.0/debian/changelog	2015-10-31 14:19:03.000000000 +0000
+++ ndg-httpsclient-0.4.0/debian/changelog	2015-11-05 09:49:48.000000000 +0000
@@ -1,3 +1,11 @@
+ndg-httpsclient (0.4.0-3) unstable; urgency=medium
+
+  * Remove conflict between python and python3 version.
+    - this means that the binary is now provided only by the python2
+      version. (Closes: #804115)
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 05 Nov 2015 10:48:23 +0100
+
 ndg-httpsclient (0.4.0-2) unstable; urgency=medium
 
   * Add python3 package. (Closes: #803525)
diff -Nru ndg-httpsclient-0.4.0/debian/control ndg-httpsclient-0.4.0/debian/control
--- ndg-httpsclient-0.4.0/debian/control	2015-10-31 14:18:48.000000000 +0000
+++ ndg-httpsclient-0.4.0/debian/control	2015-11-05 09:43:03.000000000 +0000
@@ -19,7 +19,6 @@
 Package: python-ndg-httpsclient
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Conflicts: python3-ndg-httpsclient
 Recommends: python-pyasn1
 Description: enhanced HTTPS support for httplib and urllib2 using PyOpenSSL for Python2
  ndg-httpsclient is a HTTPS client implementation for httplib and
@@ -27,12 +26,11 @@
  implementation over the default provided with Python and importantly
  enables full verification of the SSL peer.
  .
- This is the Python2 package
+ This is the Python2 package, providing the ndg-httpsclient binary too.
 
 Package: python3-ndg-httpsclient
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
-Conflicts: python-ndg-httpsclient
 Recommends: python3-pyasn1
 Description: enhanced HTTPS support for httplib and urllib2 using PyOpenSSL for Python3
  ndg-httpsclient is a HTTPS client implementation for httplib and
diff -Nru ndg-httpsclient-0.4.0/debian/rules ndg-httpsclient-0.4.0/debian/rules
--- ndg-httpsclient-0.4.0/debian/rules	2015-10-31 07:15:29.000000000 +0000
+++ ndg-httpsclient-0.4.0/debian/rules	2015-11-05 09:46:50.000000000 +0000
@@ -13,3 +13,7 @@
 	  cd $$OLDDIR; \
 	  PYTHONPATH=. python ndg/httpsclient/test/test_urllib2.py ; \
 	  kill $$S
+
+override_dh_python3:
+	dh_python3
+	rm -rf debian/python3-ndg-httpsclient/usr/bin