diff --git a/archbuild.in b/archbuild.in
index ae4be8161b5ec026c2e9aafeb9537475e0092e95..2f8fcea55b98af25aad98a505e40af4cb0090879 100644
--- a/archbuild.in
+++ b/archbuild.in
@@ -25,6 +25,7 @@ usage() {
 	echo '    -c         Recreate the chroot before building'
 	echo '    -U         Do not update chroots before building'
 	echo '    -r <dir>   Create chroots in this directory'
+	echo '    -R         Repackage (fastpass to makepkg -R)'
 	echo ''
 	echo "Default makechrootpkg args: ${makechrootpkg_args[*]}"
 	echo ''
@@ -33,12 +34,15 @@ usage() {
 
 orig_argv=("$@")
 
-while getopts 'hcr:U' arg; do
+while getopts 'hcr:UR' arg; do
 	case "${arg}" in
 		c) clean_first=true ;;
 		U) update=false
 		   makechrootpkg_args=(-n) ;;
 		r) chroots="$OPTARG" ;;
+		R) update=false
+		   clean_first=false
+		   makechrootpkg_args=(-n -- -R -f);;
 		*) usage ;;
 	esac
 done
diff --git a/zsh_completion.in b/zsh_completion.in
index f9687d6ce8dc665ff2c93d849cfd2b76473518b8..ac8f3bb9423eb090a546fc523d7785ae62f88580 100644
--- a/zsh_completion.in
+++ b/zsh_completion.in
@@ -5,6 +5,7 @@ m4_include(lib/valid-tags.sh)
 _archbuild_args=(
 	'-c[Recreate the chroot before building]'
 	'-U[Do not update chroots before building]'
+	'-R[Repackage; fastpass to makepkg -R]'
 	'-r[Create chroots in this directory]:base_dir:_files -/'
 )