diff --git a/ChangeLog b/ChangeLog
index a35c82ac..addd3303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-28  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* configure.ac: enable parport access on x86_64 Linux and
+	FreeBSD systems.
+
+2005-11-27  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* avrdude.conf.in: add the "calibration" space to ATmega16.
+
 2005-11-25 Colin O'Flynn <coflynn@newae.com>
 
 	Fixed bug 15051, building for Windows breaks.
diff --git a/avrdude.conf.in b/avrdude.conf.in
index 6483e32b..a306d7df 100644
--- a/avrdude.conf.in
+++ b/avrdude.conf.in
@@ -2412,6 +2412,12 @@ part
         read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
       ;
+    memory "calibration"
+        size            = 1;
+
+        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+        ;
   ;
 
 
diff --git a/configure.ac b/configure.ac
index e6a57fbc..20dbe53d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,7 @@ AC_SUBST(DIST_SUBDIRS_AC, $DIST_SUBDIRS_AC)
 # Find the parallel serial device files based on target system
 # If a system doesn't have a PC style parallel, mark it as unknown.
 case $target in
-	i[[3456]]86-*-linux*)
+	i[[3456]]86-*-linux*|x86_64-*-linux*)
 		DEFAULT_PAR_PORT="/dev/parport0"
 		DEFAULT_SER_PORT="/dev/ttyS0"
 		;;
@@ -131,7 +131,7 @@ case $target in
 		DEFAULT_PAR_PORT="unknown"
 		DEFAULT_SER_PORT="/dev/ttyS0"
 		;;
-	i[[3456]]86-*-freebsd*)
+	i[[3456]]86-*-freebsd*|amd64-*-freebsd*)
 		DEFAULT_PAR_PORT="/dev/ppi0"
 		DEFAULT_SER_PORT="/dev/cuaa0"
 		;;