--- /tmp/makechrootpkg	2008-01-13 00:28:05.000000000 +0100
+++ /usr/sbin/makechrootpkg	2008-01-13 00:31:08.000000000 +0100
@@ -95,8 +95,8 @@
 source PKGBUILD
 cp PKGBUILD "$uniondir/build/"
 for f in ${source[@]}; do
-    if [ -f "$f" ]; then
-        cp "$f" "$uniondir/build/"
+    if [ -f "`basename $f`" ]; then
+        cp "`basename $f`" "$uniondir/build/"
     fi
 done
 if [ "$install" != "" -a -f "$install" ]; then
--- /tmp/mkarchroot	2008-01-13 09:31:06.000000000 +0100
+++ /usr/sbin/mkarchroot	2008-01-13 09:45:27.000000000 +0100
@@ -130,7 +130,7 @@
     pacargs="--noconfirm -v " #--noprogressbar -v
     pacargs="$pacargs --root=${working_dir}"
     # pacman takes these as relative to the given root
-    pacargs="$pacargs --dbpath=/var/lib/pacman"
+    pacargs="$pacargs --dbpath=${working_dir}/var/lib/pacman"
     pacargs="$pacargs --cachedir=/var/cache/pacman/pkg"
     if [ "$pac_conf" != "" ]; then
         pacargs="$pacargs --config=${pac_conf}"