diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000000000000000000000000000000000000..224e6dd7d24b9eda1da5a5d9ae4624ae473b18a3
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,98 @@
+restrictedpython (3.6.0-0ubuntu4) saucy; urgency=low
+
+ * debian/patches/remove_new_python_tests.patch: remove, this was needed to
+ support python 2.6
+ * debian/patches/no_requires.patch: remove, now handled by dh_python2.
+ * debian/copyright: update to copyright-format 1.0
+ * debian/tests: switch to zope.testrunner.
+ * Update Standards-Version to 3.9.4
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Thu, 04 Jul 2013 00:37:44 +0300
+
+restrictedpython (3.6.0-0ubuntu3) precise; urgency=low
+
+ * Rebuild to drop python2.6 dependencies.
+
+ -- Matthias Klose <doko@ubuntu.com> Sat, 31 Dec 2011 02:13:36 +0000
+
+restrictedpython (3.6.0-0ubuntu2) oneiric; urgency=low
+
+ * Use dh_python2 instead of deprecated python-central (LP: #831411).
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Wed, 24 Aug 2011 19:09:29 +0300
+
+restrictedpython (3.6.0-0ubuntu1) maverick; urgency=low
+
+ * New upstream release.
+ * Switch to dpkg-source 3.0 (quilt) format
+ * Convert to debhelper 7, do not use van.pydeb
+ * Update Standards-Version to 3.8.4
+ * Build only for python >= 2.6
+ * debian/patches/add_license.dpatch: remove, the tarball now includes
+ a license.
+ * debian/patches/remove_new_python_tests.dpatch: remove, this was needed
+ to support python 2.4 and 2.5
+ * debian/patches/remove_new_python_tests.patch: add a similar patch
+ to remove tests that do not compile with python 2.6
+ * debian/patches/no_requires.patch: remove unneeded setuptools dependency
+ * debian/copyright: convert to dep5 format
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Thu, 26 Aug 2010 04:14:24 +0300
+
+restrictedpython (3.5.1-0ubuntu4) lucid; urgency=low
+
+ * Upload for Lucid (LP: #520199)
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Thu, 11 Feb 2010 02:53:49 +0200
+
+restrictedpython (3.5.1-0ubuntu3) karmic; urgency=low
+
+ * debian/patches/add_license.dpatch: New patch to add a license
+ * List dpatch and debhelper in Build-Depends, others in Build-Depends-Indep
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Thu, 11 Feb 2010 13:23:27 +0200
+
+restrictedpython (3.5.1-0ubuntu2) karmic; urgency=low
+
+ * Switch to using van.pydeb
+ * Fix debian/tests to work on python2.6
+ * Limit Python-Versions to << 2.7, this version handles only up to 2.6
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Thu, 11 Feb 2010 02:41:09 +0200
+
+restrictedpython (3.5.1-0ubuntu1) karmic; urgency=low
+
+ * New upstream release
+ * Add copyright
+ * debian/patches/remove_new_python_tests.dpatch: remove windows newlines
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Tue, 05 Jan 2010 19:40:40 +0200
+
+python-restrictedpython (3.4.3-1) hardy; urgency=low
+
+ * New upstream release
+ * Build for all python versions
+ * Build-depend on dpatch
+ * debian/patches/remove_new_python_tests.dpatch: remove tests that do not
+ compile on python 2.4, causing install to fail.
+
+ -- Gediminas Paulauskas <menesis@pov.lt> Fri, 22 May 2009 19:03:54 +0300
+
+python-restrictedpython (3.4.2-2) gutsy; urgency=low
+
+ * Add conflicts: zope3
+
+ -- Brian Sutherland <brian@vanguardistas.net> Wed, 23 Jul 2008 03:17:48 +0200
+
+python-restrictedpython (3.4.2-1ubuntu1) gutsy; urgency=low
+
+ * Restrict to python 2.4 based on zope-dev mailing list chatter claiming
+ restricted python is a problem for python 2.5 migrtion.
+
+ -- Brian Sutherland <brian@vanguardistas.net> Mon, 21 Apr 2008 19:37:18 +0200
+
+python-restrictedpython (3.4.2-1) gutsy; urgency=low
+
+ * Inital Release
+
+ -- Brian Sutherland <brian@vanguardistas.net> Thu, 8 Nov 2007 19:27:48 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000000000000000000000000000000000000..7f8f011eb73d6043d2e6db9d2c101195ae2801f2
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000000000000000000000000000000000000..91e1a552da2d4e223f7fb2b8d2150456a66c8361
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,24 @@
+Source: restrictedpython
+Section: python
+Priority: extra
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Gediminas Paulauskas <menesis@pov.lt>
+Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~), python-setuptools, python3-all, python3-setuptools
+Standards-Version: 3.9.4
+X-Python-Version: >= 2.7
+
+Package: python-restrictedpython
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Conflicts: zope3
+Description: Restricted execution environment for Python
+ RestrictedPython provides a restricted execution environment for Python,
+ e.g. for running untrusted code.
+
+Package: python3-restrictedpython
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Conflicts: zope3
+Description: Restricted execution environment for Python
+ RestrictedPython provides a restricted execution environment for Python,
+ e.g. for running untrusted code.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000000000000000000000000000000000000..94fdb1943b78867e6d63cb71c8b8e921fce22d18
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,52 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: RestrictedPython
+Upstream-Contact: Zope Foundation and Contributors <zope-dev@zope.org>
+Source: http://pypi.python.org/pypi/RestrictedPython
+
+Files: *
+Copyright: (c) 2002-2010 Zope Foundation and Contributors.
+License: Zope-2.1
+ Zope Public License (ZPL) Version 2.1
+ .
+ A copyright notice accompanies this license document that identifies the
+ copyright holders.
+ .
+ This license has been certified as open source. It has also been designated as
+ GPL compatible by the Free Software Foundation (FSF).
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions in source code must retain the accompanying copyright
+ notice, this list of conditions, and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the accompanying copyright
+ notice, this list of conditions, and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Names of the copyright holders must not be used to endorse or promote
+ products derived from this software without prior written permission from the
+ copyright holders.
+ .
+ 4. The right to distribute this software or to use it for any purpose does not
+ give you the right to use Servicemarks (sm) or Trademarks (tm) of the
+ copyright
+ holders. Use of them is covered by separate agreement with the copyright
+ holders.
+ .
+ 5. If any files are modified, you must cause the modified files to carry
+ prominent notices stating that you changed the files and the date of any
+ change.
+ .
+ Disclaimer
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000000000000000000000000000000000000..40a79f63301d8434d4c44587fe7af402cab78e48
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh --with python2,python3 $@
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000000000000000000000000000000000000..163aaf8d82b6c54f23c45f32895dbdfdcc27b047
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/tests/all b/debian/tests/all
new file mode 100644
index 0000000000000000000000000000000000000000..43c5541a90b5f282d7e4e88631e8822fc706ecbc
--- /dev/null
+++ b/debian/tests/all
@@ -0,0 +1,3 @@
+#!/bin/bash
+testfilter="-s RestrictedPython"
+. /usr/share/python-zope.testrunner/test_helper
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000000000000000000000000000000000000..e3d86272589da77b10abd8a9a3c94584943ab89a
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: all
+Depends: @, python-zope.testrunner
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000000000000000000000000000000000000..c5482fae87384f2f6d62eb5e2298e50fbaea5f6a
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://pypi.python.org/packages/source/R/RestrictedPython/RestrictedPython-(.*)\.(?:tar\.gz|zip)