diff --git a/.cvsignore b/.cvsignore
index 7e78bc7d..ba756f31 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -16,3 +16,4 @@ locale
 share
 Packages.gz
 *.prof
+linkchecker-md5sums.txt
diff --git a/Makefile b/Makefile
index 9ff3de8d..f3587c46 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # This Makefile is only used by developers.
-PYTHON=python2.1
+PYTHON=python2.2
 VERSION=$(shell $(PYTHON) setup.py --version)
 PACKAGE=linkchecker
 NAME=$(shell $(PYTHON) setup.py --name)
diff --git a/TODO b/TODO
index 6ce5009d..4050079d 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
+ftp_proxy support
 Check why threaded app wont exit resp. is stalled
 Another Profiling roundup
 Named constants for ANSI Color codes
diff --git a/debian/control b/debian/control
index 39502849..5ff3b0cb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: linkchecker
 Section: web
 Priority: optional
 Maintainer: Bastian Kleineidam <calvin@debian.org>
-Build-Depends-Indep: python2.1-dev, debhelper (>= 3.0.0), gettext
+Build-Depends-Indep: python2.2-dev, debhelper (>= 3.0.0), gettext
 Standards-Version: 3.5.7.0
 
 Package: linkchecker
 Architecture: all
-Depends: python2.1, python-dns
+Depends: python2.2, python-dns
 Conflicts: linkchecker-ssl
 Description: check HTML documents for broken links
  Features:
diff --git a/debian/linkchecker.postinst b/debian/linkchecker.postinst
index 6d62aaac..a0635465 100755
--- a/debian/linkchecker.postinst
+++ b/debian/linkchecker.postinst
@@ -3,7 +3,7 @@
 # Written 1998 by Gregor Hoffleit <flight@debian.org>.
 # used by Bastian Kleineidam for LinkChecker
 set -e
-PYVER=2.1
+PYVER=2.2
 PYTHON=python
 PYTHONXY=${PYTHON}${PYVER}
 SITEPACKAGES=/usr/lib/$PYTHONXY/site-packages
diff --git a/debian/linkchecker.prerm b/debian/linkchecker.prerm
index 5fcaafd9..89bd44bc 100755
--- a/debian/linkchecker.prerm
+++ b/debian/linkchecker.prerm
@@ -4,7 +4,7 @@
 # used by Bastian Kleineidam for LinkChecker
 set -e
 PACKAGE=linkchecker
-PYVER=2.1
+PYVER=2.2
 PYTHON=python
 PYTHONXY=${PYTHON}${PYVER}
 
diff --git a/debian/rules b/debian/rules
index edb5d327..e7e49a1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 PACKAGE=linkchecker
 ROOT=$(CURDIR)/debian/$(PACKAGE)
 DOCDIR = $(ROOT)/usr/share/doc/$(PACKAGE)
-PYTHON=python2.1
+PYTHON=python2.2
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
diff --git a/po/Makefile b/po/Makefile
index edf3d0c5..1aedf190 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -1,6 +1,6 @@
 # I copied the scripts in Tools/i18n of the Python 2.0 distribution
 I18NTOOLS=.
-PYTHON=python2.1
+PYTHON=python2.2
 GETTEXT=$(PYTHON) $(I18NTOOLS)/pygettext.py -k linkcheck._
 MSGFMT=$(PYTHON) $(I18NTOOLS)/msgfmt.py
 #MSGFMT=msgfmt
diff --git a/setup.py b/setup.py
index 61bdb180..4bbd3df3 100755
--- a/setup.py
+++ b/setup.py
@@ -131,7 +131,7 @@ myname = "Bastian Kleineidam"
 myemail = "calvin@users.sourceforge.net"
 
 setup (name = "linkchecker",
-       version = "1.6.3",
+       version = "1.6.4",
        description = "check HTML documents for broken links",
        author = myname,
        author_email = myemail,