diff --git a/debian/changelog b/debian/changelog
index 2dafe7f..f62a7e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,19 @@
 ubuntu-dev-tools (0.74) UNRELEASED; urgency=low
 
+  [ Kees Cook ]
   * mk-sbuild-lv:
-    - skip security repo for Debian unstable, thanks to Ryan Niebur
+    - Skip security repo for Debian unstable, thanks to Ryan Niebur
       (LP: #371569).
-    - change directory out of the way of schroot problems.
+    - Change directory out of the way of schroot problems.
 
- -- Kees Cook <kees@ubuntu.com>  Mon, 04 May 2009 09:11:42 -0700
+  [ Siegfried-Angel Gevatter Pujals ]
+  * grab-merge:
+     - Show an error message if the package doesn't exist.
+     - Be paraonic and add "--one-file-system" to the rm call.
+     - Delete the directory just after creating it if the package
+       doesn't exist.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Wed, 06 May 2009 23:14:33 +0200
 
 ubuntu-dev-tools (0.73) karmic; urgency=low
 
diff --git a/grab-merge b/grab-merge
index c23589b..98d3da8 100755
--- a/grab-merge
+++ b/grab-merge
@@ -40,14 +40,14 @@ if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
 fi
 
 if [ "$SUBDIR" = "y" ]; then
-    [ -d "$MERGE" ] || mkdir $MERGE
+    [ -d "$MERGE" ] || { mkdir $MERGE; CREATED_DIR=1; }
     cd $MERGE
 fi
 
 if [ "$EXPERT" != "y" ] && [ -n "$(ls)" ]; then
-    echo -n "Sure you want to delete all the files in $(pwd) [yn]? "
+    echo -n "Are you sure you want to delete all the files in $(pwd) [yN]? "
     read ANSWER
-    [ $ANSWER = y ]
+    [ "$ANSWER" = "y" ] || exit 1
 fi
 
 if [ "${MERGE#lib}" != "${MERGE}" ]; then
@@ -61,8 +61,12 @@ if [ "$RSYNC" = "y" ]; then
     rsync --verbose --archive --progress --compress --delete \
 	"$URL" . || { echo "Error while rsyncing $URL"; exit 1; }
 else
-    rm -rf  *
-    wget -q https://merges.ubuntu.com/$HASH/$MERGE/REPORT
+    rm -rf  --one-file-system *
+    wget -q https://merges.ubuntu.com/$HASH/$MERGE/REPORT || {
+            echo "Package not found on merges.ubuntu.com."
+            [ "$CREATED_DIR" != "1" ] || { cd ..; rmdir $MERGE; }
+            exit 1
+        }
 
     for NAME in $(sed -n -e "/^    /p" REPORT); do
 	echo "Getting $NAME..."