diff --git a/rabbitmq-script-wrapper b/rabbitmq-script-wrapper
index 7feb2ef..f49c27f 100644
--- a/rabbitmq-script-wrapper
+++ b/rabbitmq-script-wrapper
@@ -16,13 +16,14 @@
 ##
 
 # Escape spaces and quotes, because shell is revolting.
+CMDLINE=""
 for arg in "$@" ; do
-	# Escape quotes in parameters, so that they're passed through cleanly.
-	arg=$(sed -e 's/"/\\"/g' <<-END
-		$arg
-		END
-	)
-	CMDLINE="${CMDLINE} \"${arg}\""
+    # Escape quotes in parameters, so that they're passed through cleanly.
+    arg=$(sed -e 's/"/\\"/g' <<-END
+        $arg
+        END
+    )
+    CMDLINE="${CMDLINE} \"${arg}\""
 done
 
 cd /var/lib/rabbitmq
diff --git a/rabbitmq-server.changes b/rabbitmq-server.changes
index 96ecff0..7518176 100644
--- a/rabbitmq-server.changes
+++ b/rabbitmq-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep 28 10:01:29 UTC 2015 - dmueller@suse.com
+
+- rabbitmqctl: clear CMDLINE before appending
+
 -------------------------------------------------------------------
 Thu Sep 24 10:17:52 UTC 2015 - dmueller@suse.com