diff --git a/DNS/Lib.py b/DNS/Lib.py
index 424de3b8..e2c70f6f 100644
--- a/DNS/Lib.py
+++ b/DNS/Lib.py
@@ -102,7 +102,7 @@ class Packer:
 			label = list[j]
 			n = len(label)
 			if offset + len(buf) < 0x3FFF:
-				index.append(keys[j], offset + len(buf))
+				index.append((keys[j], offset + len(buf)))
 			else:
 				print 'DNS.Lib.Packer.addname:',
 				print 'warning: pointer too big'
diff --git a/README.tmpl b/README.tmpl
index 8c7d63ea..fabed4d1 100644
--- a/README.tmpl
+++ b/README.tmpl
@@ -43,6 +43,7 @@ httplib.py (renamed to http11lib.py and a bug fixed)
 fcgi.py (implemented streamed output)
 sz_fcgi.py (simplified the code)
 DNS/Lib.py:566 fixed rdlength name error
+DNS/Lib.py:105 tuple parameter for Python 1.6 compatibility
 DNS/Base.py: fixed /etc/resolv.conf parser to cope with empty lines
 
 
diff --git a/debian/changelog b/debian/changelog
index ca9b3541..f81aadab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 linkchecker (1.2.5) unstable; urgency=low
 
-  * fix /etc/resolv.conf parsing again (this time for real)
+  * fix /etc/resolv.conf parsing again (this time for real?)
+  * tuple param in DNS/Lib.py for Python 1.6 compatibility
+  * adjust #! line in linkchecker script to correct python interpreter
 
- -- Bastian Kleineidam <calvin@users.sourceforge.net>  Mon, 21 Aug 2000 23:59:35 +0200
+ -- Bastian Kleineidam <calvin@users.sourceforge.net>  Thu,  7 Sep 2000 00:21:07 +0200
 
 linkchecker (1.2.4) unstable; urgency=low
 
diff --git a/install.py.tmpl b/install.py.tmpl
index e0f5380e..7a28af8f 100644
--- a/install.py.tmpl
+++ b/install.py.tmpl
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 """
-import os
+import os,sys
 from Template import Template
 
 distpath = os.getcwd()
@@ -28,6 +28,7 @@ data = {
     'url': '$url',
     'appname': '$appname',
     'email': '$email',
+    'python': os.path.normpath(sys.executable),
 }
 files = [
     'linkchecker',
diff --git a/linkcheck/HttpUrlData.py b/linkcheck/HttpUrlData.py
index f18f52e8..813891f5 100644
--- a/linkcheck/HttpUrlData.py
+++ b/linkcheck/HttpUrlData.py
@@ -21,7 +21,6 @@ from RobotsTxt import RobotsTxt
 import Config,StringUtil
 from linkcheck import _
 
-
 class HttpUrlData(UrlData):
     "Url link with http scheme"
     netscape_re = re.compile("Netscape-Enterprise/")
diff --git a/linkchecker.tmpl b/linkchecker.tmpl
index da229a8d..de5ddb0a 100755
--- a/linkchecker.tmpl
+++ b/linkchecker.tmpl
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!$python
 
 import sys
 
diff --git a/test/test1.html b/test/test1.html
index 88f7ac06..46ad1564 100644
--- a/test/test1.html
+++ b/test/test1.html
@@ -6,6 +6,7 @@ Just some HTTP links
 <a href="http://">
 <a href="http:/">
 <a href="http:">
+<a href="http://www.blubb.de/stalter&sohn">
 <a name="iswas"> <!-- anchor for test2.html -->
 <a href=http://slashdot.org/>
 <a href="http://treasure.calvinsplayground.de/~calvin/software/#isnix">