diff -rupN debian_original/changelog python-tornado-2.1.0/debian/changelog
--- debian_original/changelog	2011-09-23 13:47:31.000000000 +0100
+++ python-tornado-2.1.0/debian/changelog	2012-03-12 18:53:41.989902283 +0000
@@ -1,3 +1,9 @@
+python-tornado (2.1.0-2) unstable; urgency=low
+
+  * Package for Python 3.
+
+ -- Thomas Kluyver <thomas@kluyver.me.uk>  Thu, 08 Mar 2012 21:22:30 +0000
+
 python-tornado (2.1.0-1) unstable; urgency=low
 
   * Team upload
diff -rupN debian_original/control python-tornado-2.1.0/debian/control
--- debian_original/control	2011-09-23 13:47:31.000000000 +0100
+++ python-tornado-2.1.0/debian/control	2012-03-08 21:25:09.133275748 +0000
@@ -1,10 +1,11 @@
 Source: python-tornado
 Section: python
 X-Python-Version: >= 2.5
+X-Python3-Version: >= 3.2
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
 Uploaders: Carl Chenet <chaica@ohmytux.com>, Yaroslav Halchenko <debian@onerussian.com>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3)
+Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3), python3-all-dev, python3-setuptools
 Standards-Version: 3.9.2
 Homepage: http://www.tornadoweb.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-tornado/trunk/
@@ -21,3 +22,18 @@ Description: scalable, non-blocking web
  is written using a web framework that looks a bit like web.py or
  Google's webapp, but with additional tools and optimizations to take
  advantage of the underlying non-blocking infrastructure.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-tornado
+Architecture: any
+Depends: ${shlibs:Depends}, ${python3:Depends}, ${misc:Depends}, python3 (>= 3.2), ca-certificates
+Breaks: ${python3:Breaks}
+Description: scalable, non-blocking web server and tools
+ Tornado is an open source version of the scalable, non-blocking
+ web server and tools that power FriendFeed. The FriendFeed application
+ is written using a web framework that looks a bit like web.py or
+ Google's webapp, but with additional tools and optimizations to take
+ advantage of the underlying non-blocking infrastructure.
+ .
+ This is the Python 3 version of the package.
diff -rupN debian_original/python3-tornado.install python-tornado-2.1.0/debian/python3-tornado.install
--- debian_original/python3-tornado.install	1970-01-01 01:00:00.000000000 +0100
+++ python-tornado-2.1.0/debian/python3-tornado.install	2012-03-08 21:20:42.765270236 +0000
@@ -0,0 +1 @@
+usr/lib/python3
diff -rupN debian_original/python-tornado.install python-tornado-2.1.0/debian/python-tornado.install
--- debian_original/python-tornado.install	1970-01-01 01:00:00.000000000 +0100
+++ python-tornado-2.1.0/debian/python-tornado.install	2012-03-08 21:20:18.357269731 +0000
@@ -0,0 +1 @@
+usr/lib/python2*
diff -rupN debian_original/rules python-tornado-2.1.0/debian/rules
--- debian_original/rules	2011-09-23 13:47:31.000000000 +0100
+++ python-tornado-2.1.0/debian/rules	2012-03-12 19:33:33.255356776 +0000
@@ -1,4 +1,26 @@
 #!/usr/bin/make -f
 
+#DH_VERBOSE=1
+
+PYTHON2=$(shell pyversions -vr)
+PYTHON3=$(shell py3versions -vr)
+
 %:
-	dh $@ --with python2
+	dh $@ --with python2,python3
+
+build-python%:
+	python$* setup.py build
+
+override_dh_auto_build: $(PYTHON3:%=build-python%)
+	dh_auto_build
+
+install-python%:
+	python$* setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+
+override_dh_auto_install: $(PYTHON3:%=install-python%)
+	dh_auto_install
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+	rm -rf *.egg-info