diff --git a/scripts/generate-svn-snapshot b/scripts/generate-svn-snapshot
index d9677b4..a61ef2d 100755
--- a/scripts/generate-svn-snapshot
+++ b/scripts/generate-svn-snapshot
@@ -128,13 +128,14 @@ cd $ORIG_DIR
 debian_only="$(svn propget mergeWithUpstream source/${branch:-}/debian)"
 
 if [ "${debian_only:-}" = "1" ] ; then
-  cd "source/${branch:-}"
-  echo "mergeWithUpstream detected, using svn-buildpackage to create source package"
-  svn-buildpackage --svn-download-orig -S \
-   --svn-builder 'dpkg-buildpackage' -d \
-   --svn-move --svn-dont-purge -uc -us \
-   --svn-move --svn-ignore-new -rfakeroot
-  cd ..
+  (
+    cd "source/${branch:-}"
+    echo "mergeWithUpstream detected, using svn-buildpackage to create source package"
+    svn-buildpackage --svn-download-orig -S \
+     --svn-builder 'dpkg-buildpackage' -d \
+     --svn-move-to="${ORIG_DIR}" --svn-dont-purge -uc -us \
+     --svn-ignore-new -rfakeroot
+  )
 else
   dpkg-source --tar-ignore=\.svn -b source/${branch:-}
 fi