diff -Nru antlr-2.7.7+dfsg/debian/changelog antlr-2.7.7+dfsg/debian/changelog
--- antlr-2.7.7+dfsg/debian/changelog	2011-11-10 21:07:20.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/changelog	2011-12-17 10:37:57.000000000 +0000
@@ -1,3 +1,10 @@
+antlr (2.7.7+dfsg-3) unstable; urgency=low
+
+  * Team upload.
+  * Build using dh_python2.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 17 Dec 2011 11:37:20 +0100
+
 antlr (2.7.7+dfsg-2) unstable; urgency=low
 
   * Team upload.
diff -Nru antlr-2.7.7+dfsg/debian/control antlr-2.7.7+dfsg/debian/control
--- antlr-2.7.7+dfsg/debian/control	2011-09-29 20:35:37.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/control	2011-12-17 10:38:30.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner@debian.org>
-Build-Depends: debhelper (>= 7), default-jdk, python, autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
-Build-Depends-Indep: maven-repo-helper, python-support (>= 0.3), nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
+Build-Depends: debhelper (>= 7), default-jdk, python (>= 2.6.6-3~), autotools-dev, python-all-dev (>= 2.3.5-11), sharutils
+Build-Depends-Indep: maven-repo-helper, nant, cli-common-dev (>= 0.7), mono-devel | c-sharp-compiler, libmono-winforms2.0-cil
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/antlr
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/antlr
diff -Nru antlr-2.7.7+dfsg/debian/.mh/antlr-2.7.7.pom antlr-2.7.7+dfsg/debian/.mh/antlr-2.7.7.pom
--- antlr-2.7.7+dfsg/debian/.mh/antlr-2.7.7.pom	1970-01-01 00:00:00.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/.mh/antlr-2.7.7.pom	2011-12-17 10:42:14.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>antlr</groupId>
+	<artifactId>antlr</artifactId>
+	<version>2.7.7</version>
+	<packaging>jar</packaging>
+	<properties>
+		<debian.mavenRules>antlr antlr jar s/2\..*/2.x/ * *</debian.mavenRules>
+		<debian.originalVersion>2.7.7</debian.originalVersion>
+		<debian.package>libantlr-java</debian.package>
+	</properties>
+	
+	<name>AntLR Parser Generator</name>
+	<description>A framework for constructing recognizers, compilers,
+    and translators from grammatical descriptions containing
+    Java, C#, C++, or Python actions.</description>
+	<url>http://www.antlr.org/</url>
+	<licenses>
+		<license>
+			<name>BSD License</name>
+			<url>http://www.antlr.org/license.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<dependencies>
+	</dependencies>
+</project>
\ No newline at end of file
diff -Nru antlr-2.7.7+dfsg/debian/.mh/antlr-2.x.pom antlr-2.7.7+dfsg/debian/.mh/antlr-2.x.pom
--- antlr-2.7.7+dfsg/debian/.mh/antlr-2.x.pom	1970-01-01 00:00:00.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/.mh/antlr-2.x.pom	2011-12-17 10:42:15.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>antlr</groupId>
+	<artifactId>antlr</artifactId>
+	<version>2.x</version>
+	<packaging>jar</packaging>
+	<properties>
+		<debian.mavenRules>antlr antlr jar s/2\..*/2.x/ * *</debian.mavenRules>
+		<debian.originalVersion>2.7.7</debian.originalVersion>
+		<debian.package>libantlr-java</debian.package>
+	</properties>
+	
+	<name>AntLR Parser Generator</name>
+	<description>A framework for constructing recognizers, compilers,
+    and translators from grammatical descriptions containing
+    Java, C#, C++, or Python actions.</description>
+	<url>http://www.antlr.org/</url>
+	<licenses>
+		<license>
+			<name>BSD License</name>
+			<url>http://www.antlr.org/license.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<dependencies>
+	</dependencies>
+</project>
\ No newline at end of file
diff -Nru antlr-2.7.7+dfsg/debian/.mh/pom.properties antlr-2.7.7+dfsg/debian/.mh/pom.properties
--- antlr-2.7.7+dfsg/debian/.mh/pom.properties	1970-01-01 00:00:00.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/.mh/pom.properties	2011-12-17 10:42:16.000000000 +0000
@@ -0,0 +1,8 @@
+#POM properties
+#Sat Dec 17 10:42:16 UTC 2011
+version=2.7.7
+groupId=antlr
+debianVersion=2.x
+type=jar
+classifier=
+artifactId=antlr
diff -Nru antlr-2.7.7+dfsg/debian/.mh/pom.properties.keep antlr-2.7.7+dfsg/debian/.mh/pom.properties.keep
--- antlr-2.7.7+dfsg/debian/.mh/pom.properties.keep	1970-01-01 00:00:00.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/.mh/pom.properties.keep	2011-12-17 10:42:14.000000000 +0000
@@ -0,0 +1,8 @@
+#POM properties
+#Sat Dec 17 10:42:14 UTC 2011
+version=2.7.7
+groupId=antlr
+debianVersion=2.x
+type=jar
+classifier=
+artifactId=antlr
diff -Nru antlr-2.7.7+dfsg/debian/.mh/pom.xml antlr-2.7.7+dfsg/debian/.mh/pom.xml
--- antlr-2.7.7+dfsg/debian/.mh/pom.xml	1970-01-01 00:00:00.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/.mh/pom.xml	2011-12-17 10:42:16.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>antlr</groupId>
+	<artifactId>antlr</artifactId>
+	<version>2.x</version>
+	<packaging>jar</packaging>
+	<properties>
+		<debian.mavenRules>antlr antlr jar s/2\..*/2.x/ * *</debian.mavenRules>
+		<debian.originalVersion>2.7.7</debian.originalVersion>
+		<debian.package>libantlr-java</debian.package>
+	</properties>
+	
+	<name>AntLR Parser Generator</name>
+	<description>A framework for constructing recognizers, compilers,
+    and translators from grammatical descriptions containing
+    Java, C#, C++, or Python actions.</description>
+	<url>http://www.antlr.org/</url>
+	<licenses>
+		<license>
+			<name>BSD License</name>
+			<url>http://www.antlr.org/license.html</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<dependencies>
+	</dependencies>
+</project>
\ No newline at end of file
diff -Nru antlr-2.7.7+dfsg/debian/python-antlr.dirs antlr-2.7.7+dfsg/debian/python-antlr.dirs
--- antlr-2.7.7+dfsg/debian/python-antlr.dirs	2009-01-15 19:25:39.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/python-antlr.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/share/python-support/antlr
diff -Nru antlr-2.7.7+dfsg/debian/rules antlr-2.7.7+dfsg/debian/rules
--- antlr-2.7.7+dfsg/debian/rules	2011-11-10 21:07:20.000000000 +0000
+++ antlr-2.7.7+dfsg/debian/rules	2011-12-17 10:46:09.000000000 +0000
@@ -73,7 +73,9 @@
 	$(MAKE) -f debian/Makefile.debian install DESTDIR=`pwd`/debian/antlr
 	mv debian/antlr/usr/share/java/* debian/libantlr-java/usr/share/java/
 	rmdir debian/antlr/usr/share/java/
-	install -m644 lib/python/antlr/antlr.py debian/python-antlr/usr/share/python-support/antlr
+	mkdir -p debian/python-antlr/usr/lib/$$(pyversions -d)/dist-packages
+	install -m644 lib/python/antlr/antlr.py \
+		debian/python-antlr/usr/lib/$$(pyversions -d)/dist-packages/.
 	install -m644 -D CHANGES.txt debian/antlr/usr/share/doc/antlr/changelog
 	install -m644 -D CHANGES.txt debian/antlr-doc/usr/share/doc/antlr-doc/changelog
 	mh_installpoms -plib$(PACKAGE)-java
@@ -148,7 +150,7 @@
 	# python-antlr
 	dh_installdocs -ppython-antlr
 	dh_installchangelogs -ppython-antlr
-	dh_pysupport -ppython-antlr
+	dh_python2 -ppython-antlr
 	dh_compress -ppython-antlr
 	dh_fixperms -ppython-antlr
 	dh_installdeb -ppython-antlr