diff --git a/src/gnome-shell-jhbuild.in b/src/gnome-shell-jhbuild.in
index 3774777ab..f10a576ff 100755
--- a/src/gnome-shell-jhbuild.in
+++ b/src/gnome-shell-jhbuild.in
@@ -548,3 +548,8 @@ try:
 finally:
     if options.replace and (options.perf or not normal_exit):
         restore_gnome()
+
+if normal_exit:
+    sys.exit(0)
+else:
+    sys.exit(1)