--- /tmp/makechrootpkg	2008-01-13 00:28:05.000000000 +0100
+++ /usr/sbin/makechrootpkg	2008-01-13 21:31:36.000000000 +0100
@@ -51,6 +51,14 @@
 # Pass all arguments after -- right to makepkg
 MAKEPKG_ARGS="$MAKEPKG_ARGS ${*:$OPTIND}"
 
+# See if -R was passed to makepkg
+for arg in ${*:$OPTIND}; do
+    if [ "$arg" = "-R" ]; then
+        REPACK=1
+	break;
+    fi
+done
+
 if [ "$EUID" != "0" ]; then
     echo "This script must be run as root."
     exit 1
@@ -90,6 +98,9 @@
 
 echo "moving build files to chroot"
 [ -d "$uniondir/build" ] || mkdir "$uniondir/build"
+# If the user wants only to repackage, don't remove what's left
+# in the build directory from the previous makepkg run
+[ "$REPACK" = "1" ] || rm -rf "$uniondir/build/"*
 chown -R nobody "$uniondir/build"
 
 source PKGBUILD
@@ -129,7 +140,6 @@
 else	
     source ${WORKDIR}/PKGBUILD
     mv ${chrootdir}/rw/build/${pkgname}-${pkgver}-*.pkg.tar.gz ${WORKDIR}
-    rm -rf ${chrootdir}/rw/build/*
     echo "Build complete"
 fi