diff -Naur old/INSTALL new/INSTALL
--- old/INSTALL	2003-08-31 02:13:36.000000000 +0200
+++ new/INSTALL	2003-08-31 03:26:47.000000000 +0200
@@ -13,8 +13,6 @@
        kernel /boot/loader
 - Create a temporary directory (let's call it /gkf) and untar the base
   system into it (don't untar it on /!!)
-- Make sure /gkf/etc/fstab points to the disk devices you want. Refer to
-  the FreeBSD handbook for details on KFreeBSD's device names.
 - Use the "swap" script to swap /gkf with /. Make sure nothing but /
   and /dev is mounted when you run it!! Note this may well trash your existing
   FreeBSD system, don't have important data on it!
@@ -33,10 +31,6 @@
   - if you have a gateway, add its route. eg:
 	route add -net 0.0.0.0 mygateway
   - start|stop the daemons, eg: /etc/init.d/inetutils-inetd start|stop
-- Setup APT. You'll need to run the "apt_up" script every time after
-  "apt-get update". this is because apt-get is unable to retrieve binary-all
-  package data from the official archive:
-    apt-get update || /root/apt_up
 - Some more glitches:
   - /usr/include is unhappy. copy machine.i386 from my glibc patch dir
     into /usr/include/machine, then apply my include.diff patch.
diff -Naur old/sources.list new/sources.list
--- old/sources.list	2003-08-27 06:10:56.000000000 +0200
+++ new/sources.list	2003-08-31 02:30:00.000000000 +0200
@@ -2,13 +2,11 @@
 # Remember that you can only use http, ftp or file URIs
 # CDROMs are managed through the apt-cdrom tool.
 
-# apt has trouble when it recieves an http 404 error, so you
-# must use ftp here
-# (it will get an error for binary-freebsd-i386/Packages)
-deb ftp://ftp.fi.debian.org/debian unstable main
+# XXX: This is a workaround to be able to use binary-all
+#      from the binary-i386
+deb http://ftp.fi.debian.org/debian/ dists/unstable/main/binary-i386
 
-#deb ftp://khazad.dyndns.org/pub/apt unstable main
-deb ftp://localhost/pub/apt unstable main
+deb ftp://khazad.dyndns.org/pub/apt unstable main
+#deb ftp://localhost/pub/apt unstable main
 
-# Uncomment if you want the apt-get source function to work
 deb-src http://ftp.fi.debian.org/debian unstable main
diff -Naur old/swap new/swap
--- old/swap	2003-08-31 03:19:37.000000000 +0200
+++ new/swap	2003-08-31 05:42:18.000000000 +0200
@@ -1,4 +1,15 @@
 #!/bin/sh -e
+#
+# Script to swap from a FreeBSD system to a Debian GNU/KFreeBSD
+#
+# Originally written by Robert Millan <rmh@debian.org>
+# Modified by Guillem Jover <guillem@debian.org
+#
+# 2003-08-31 03:23:39+0200
+#
+
+OLDROOT=/old
+NEWROOT=$1
 
 if ! test "$#" = "1" ; then
   echo swaps root filesystem contents with a given directory
@@ -13,14 +24,15 @@
   exit
 fi
 
-test -e /bin/mkdir
-test -e /bin/mv
-test -e /$1
-test ! -e /old
+test -e /bin/mkdir || { echo Needed /bin/mkdir does not exist; exit 1; }
+test -e /bin/mv || { echo Needed /bin/mv does not exist; exit 1; }
+
+test -e $NEWROOT || { echo Directory $NEWROOT does not exist; exit 1; }
+test ! -e $OLDROOT || { echo Directory $OLDROOT already exist; exit 1; }
 
 move_list=""
 for i in /* ; do
-  if ! test "$i" = "/dev" ; then
+  if ! test "$i" = "/dev" -o "$i" = "/boot" ; then
     move_list="$move_list $i"
   fi
 done
@@ -29,20 +41,25 @@
 echo verify it and press Enter to continue.
 read KEY
 
-rmdir /$1/dev
+rm -rf $NEWROOT/dev
+rm -rf $NEWROOT/boot
 
 # we want to know what happens here..
 set -x
 
-mkdir /old
-echo "$move_list" | xargs -J % mv % /old/
-LD_LIBRARY_PATH=/old/usr/libexec:/old/lib:/old/usr/lib /old/bin/mv /old/$1/* /
+mkdir $OLDROOT
+echo "$move_list" | xargs -J % mv % $OLDROOT/
+LD_LIBRARY_PATH=$OLDROOT/usr/libexec:$OLDROOT/lib:$OLDROOT/usr/lib $OLDROOT/bin/mv $OLDROOT$NEWROOT/* /
 
 # using native commands now
 
-rmdir /old/$1
-mv /old /$1
+rmdir $OLDROOT$NEWROOT
+mv $OLDROOT $NEWROOT
 
 set +x
-echo seems it went ok
+
+echo Using old /etc/fstab
+cp -f $OLDROOT/etc/fstab /etc/
+
+echo Seems it went ok