diff --git a/extras/unrealircd-upgrade-script.in b/extras/unrealircd-upgrade-script.in
index 1f6f9e01d..6c3005b8e 100644
--- a/extras/unrealircd-upgrade-script.in
+++ b/extras/unrealircd-upgrade-script.in
@@ -118,4 +118,6 @@ fi
 
 chmod +x unrealircd-upgrade-script.stage2
 ./unrealircd-upgrade-script.stage2 $*
+SAVERET="$?"
 rm -f unrealircd-upgrade-script.stage2 unrealircd-upgrade-script.stage2
+exit $SAVERET
diff --git a/unrealircd.in b/unrealircd.in
index 8c5cbaadb..bdfdc8265 100644
--- a/unrealircd.in
+++ b/unrealircd.in
@@ -301,6 +301,7 @@ elif [ "$1" = "hot-patch" -o "$1" = "cold-patch" ] ; then
 	fi
 elif [ "$1" = "upgrade" ] ; then
 	@BINDIR@/unrealircd-upgrade-script $*
+	exit
 elif [ "$1" = "genlinkblock" ] ; then
 	@BINDIR@/unrealircd -L
 else