diff -Nru pyrad-2.0/debian/changelog pyrad-2.0/debian/changelog
--- pyrad-2.0/debian/changelog	2013-02-16 08:57:41.000000000 +0000
+++ pyrad-2.0/debian/changelog	2015-05-26 09:28:09.000000000 +0000
@@ -1,3 +1,15 @@
+pyrad (2.0-3) unstable; urgency=low
+
+  [ Jeremy Lainé ]
+  * Build both python-pyrad an python3-pyrad packages (Closes: #782931).
+  * Update URL in debian/watch file to use Debian PyPI redirector.
+  * Update Standards-Version to 3.9.6 (no changes).
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+ -- Jeremy Lainé <jeremy.laine@m4x.org>  Tue, 26 May 2015 11:01:45 +0200
+
 pyrad (2.0-2) unstable; urgency=high
 
   * Use a better random number generator to prevent predictable password
diff -Nru pyrad-2.0/debian/control pyrad-2.0/debian/control
--- pyrad-2.0/debian/control	2012-09-07 10:45:16.000000000 +0000
+++ pyrad-2.0/debian/control	2015-05-26 09:00:10.000000000 +0000
@@ -3,17 +3,23 @@
 Priority: optional
 Maintainer: Jeremy Lainé <jeremy.laine@m4x.org>
 Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>, Bjorn Ove Grotan <bgrotan@grotan.com> 
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all,
+               python-setuptools,
+               python3-all,
+               python3-setuptools
+Standards-Version: 3.9.6
 Homepage: http://pypi.python.org/pypi/pyrad
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyrad/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyrad/trunk/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyrad/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/pyrad/trunk/
+X-Python-Version: >= 2.6
+X-Python3-Version: >= 3.2
 
 Package: python-pyrad
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-Description: Python module for creating and decoding RADIUS packets
+Description: Python module for creating and decoding RADIUS packets (Python 2)
  It takes care of all the details like building RADIUS 
  packets, sending them and decoding responses.
  This package contains several modules:
@@ -22,3 +28,20 @@
   - server: Basic RADIUS server and proxy classes.
   - packet: a RADIUS packet as send to/from servers
   - tools: utility functions
+ .
+ This package contains the module for Python 2.
+
+Package: python3-pyrad
+Architecture: all
+Depends: ${misc:Depends}, ${python3:Depends}
+Description: Python module for creating and decoding RADIUS packets (Python 3)
+ It takes care of all the details like building RADIUS 
+ packets, sending them and decoding responses.
+ This package contains several modules:
+  - client: RADIUS client code
+  - dictionary: RADIUS attribute dictionary
+  - server: Basic RADIUS server and proxy classes.
+  - packet: a RADIUS packet as send to/from servers
+  - tools: utility functions
+ .
+ This package contains the module for Python 3.
diff -Nru pyrad-2.0/debian/patches/python3.patch pyrad-2.0/debian/patches/python3.patch
--- pyrad-2.0/debian/patches/python3.patch	1970-01-01 00:00:00.000000000 +0000
+++ pyrad-2.0/debian/patches/python3.patch	2015-05-26 09:12:10.000000000 +0000
@@ -0,0 +1,16 @@
+Tuple parameter unpacking was removed in Python 3, see:
+
+https://www.python.org/dev/peps/pep-3113/
+
+--- a/pyrad/curved.py
++++ b/pyrad/curved.py
+@@ -35,7 +35,8 @@
+     def createPacket(self, **kwargs):
+         raise NotImplementedError('Attempted to use a pure base class')
+ 
+-    def datagramReceived(self, datagram, (host, port)):
++    def datagramReceived(self, datagram, source):
++        host, port = source
+         try:
+             pkt = self.CreatePacket(packet=datagram)
+         except packet.PacketError as err:
diff -Nru pyrad-2.0/debian/patches/series pyrad-2.0/debian/patches/series
--- pyrad-2.0/debian/patches/series	2013-02-16 08:49:42.000000000 +0000
+++ pyrad-2.0/debian/patches/series	2015-05-26 09:07:24.000000000 +0000
@@ -1 +1,2 @@
 change_random_generator.patch
+python3.patch
diff -Nru pyrad-2.0/debian/rules pyrad-2.0/debian/rules
--- pyrad-2.0/debian/rules	2012-09-07 10:40:44.000000000 +0000
+++ pyrad-2.0/debian/rules	2015-05-26 08:58:48.000000000 +0000
@@ -1,4 +1,11 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+
+export PYBUILD_DESTDIR_python2=debian/python-pyrad/
+export PYBUILD_DESTDIR_python3=debian/python3-pyrad/
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3 --buildsystem=pybuild
+
+override_dh_auto_test:
+	:
diff -Nru pyrad-2.0/debian/watch pyrad-2.0/debian/watch
--- pyrad-2.0/debian/watch	2012-09-07 10:34:25.000000000 +0000
+++ pyrad-2.0/debian/watch	2015-05-26 09:29:20.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-http://pypi.python.org/packages/source/p/pyrad/pyrad-(.+)\.tar\.gz
+http://pypi.debian.net/pyrad/pyrad-(.+)\.tar\.gz