diff --git a/CONF.sh b/CONF.sh
index b08cd9f5..8bdff530 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -75,7 +75,20 @@ export OFFICIAL="Unofficial"
 #export OFFICIAL="Official Beta"
 
 # ... for arch  
-export ARCH=`dpkg --print-architecture`
+CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null`
+if [ $? -ne 0 ] ; then
+    CPU=`dpkg-architecture -qDEB_HOST_ARCH`
+fi
+KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null`
+if [ $? -ne 0 ] ; then
+    KERNEL=linux
+fi
+if [ $KERNEL = linux ] ; then
+    ARCH=$CPU
+else
+    ARCH="$KERNEL-$CPU"
+fi
+export CPU KERNEL ARCH
 
 # IMPORTANT : The 4 following paths must be on the same partition/device.
 #	      If they aren't then you must set COPYLINK below to 1. This
diff --git a/debian/CONF.sh b/debian/CONF.sh
index 5a9afc61..e3224b76 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -75,7 +75,20 @@ export OFFICIAL="Unofficial"
 #export OFFICIAL="Official Beta"
 
 # ... for arch  
-export ARCH=`dpkg --print-architecture`
+CPU=`dpkg-architecture -qDEB_HOST_DPKG_CPU 2>/dev/null`
+if [ $? -ne 0 ] ; then
+    CPU=`dpkg-architecture -qDEB_HOST_ARCH`
+fi
+KERNEL=`dpkg-architecture -qDEB_HOST_DPKG_OS 2>/dev/null`
+if [ $? -ne 0 ] ; then
+    KERNEL=linux
+fi
+if [ $KERNEL = linux ] ; then
+    ARCH=$CPU
+else
+    ARCH="$KERNEL-$CPU"
+fi
+export CPU KERNEL ARCH
 
 # IMPORTANT : The 4 following paths must be on the same partition/device.
 #	      If they aren't then you must set COPYLINK below to 1. This
diff --git a/debian/changelog b/debian/changelog
index 2e6d02f6..89e0c3a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,10 @@ debian-cd (2.2.25) UNRELEASED; urgency=low
   * Move kde-desktop to end of task.list for same reason.
   * Update task-full-etch to current tasksel.
 
+  [ Steve McIntyre ]
+  * Add better GNU/kFreeBSD support in setting ARCH in CONF.sh.
+    Closes: #327470 
+
  -- Joey Hess <joeyh@debian.org>  Mon,  5 Jun 2006 15:09:01 -0400
 
 debian-cd (2.2.24) unstable; urgency=low