diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 00000000..65712579
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,4 @@
+This package uses CDBS simple patchsys. dpkg-source -x does produce source
+ready for building with dpkg-buildpackage. It does not procude source ready
+for editing. To edit or update a patch, use cdbs-edit-patch.
+See cdbs-edit-patch(1) manual page for details.
diff --git a/debian/control b/debian/control
index c5ed6e38..5dc07b92 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: terminator
 Section: misc
 XS-Python-Version: all
 Priority: optional
-Maintainer: Nicolas Valcárcel <nvalcarcel@gmail.com> 
+Maintainer: Nicolas Valcárcel Scerpella <nvalcarcel@canonical.com>
+Uploaders: Rudy Godoy Guillén <rudy@debian.org>,
+ Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 5.0.62), python, cdbs (>= 0.4.49)
 Build-Depends-Indep: python-central (>= 0.5.6)
 Standards-Version: 3.8.0
diff --git a/debian/terminator.postinst b/debian/terminator.postinst
index 8469ecbc..cf5122e2 100755
--- a/debian/terminator.postinst
+++ b/debian/terminator.postinst
@@ -1,8 +1,6 @@
 #!/bin/sh -e
 
 if [ "$1" = "configure" ]; then
-        # Add an alternative for aterm
-        update-alternatives --install /usr/bin/terminator terminator /usr/bin/terminator 30
         # Add an alternative for x-terminal-emulator
         update-alternatives --install /usr/bin/x-terminal-emulator \
                 x-terminal-emulator /usr/bin/terminator 50 \
diff --git a/terminatorlib/configfile.py b/terminatorlib/configfile.py
index e49856c7..b6f2a8ce 100644
--- a/terminatorlib/configfile.py
+++ b/terminatorlib/configfile.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 
 import re
 from terminatorlib.config import dbg, debug
diff --git a/terminatorlib/debugserver.py b/terminatorlib/debugserver.py
index 2225956c..bcb13d85 100644
--- a/terminatorlib/debugserver.py
+++ b/terminatorlib/debugserver.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 #
 # Copyright (c) 2008, Thomas Hurst <tom@hur.st>
 #
diff --git a/terminatorlib/freebsd.py b/terminatorlib/freebsd.py
index 0b38e7ab..5157172f 100644
--- a/terminatorlib/freebsd.py
+++ b/terminatorlib/freebsd.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
 #
 # Copyright (c) 2008, Thomas Hurst <tom@hur.st>
 #