diff --git a/bin/xen-create-image b/bin/xen-create-image
index 07051a4..4c2b385 100755
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@ -3395,24 +3395,13 @@ sub createFilesystem
     #  Split the command into "binary" + "args".  Make sure that
     # the binary exists and is executable.
     #
-    if ( $command =~ /([^ ]+) (.*)$/ )
-    {
-        my $binary = $1;
-        my $args   = $2;
+    my ($binary, $args) = split(/ /, $command, 2);
 
-        if ( !defined( findBinary($binary) ) )
-        {
-            logprint(
-                "The binary '$binary' required to create the filesystem $fs is missing\n"
-            );
-            $FAIL = 1;
-            exit 127;
-        }
-    }
-    else
+    if ( !defined( findBinary($binary) ) )
     {
         logprint(
-                "The filesystem creation hash is bogus for filesystem : $fs\n");
+            "The binary '$binary' required to create the filesystem $fs is missing\n"
+        );
         $FAIL = 1;
         exit 127;
     }
diff --git a/debian/changelog b/debian/changelog
index 9a22d31..d48e310 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ xen-tools (4.3~dev-1) UNRELEASED; urgency=low
     - New option --apt_proxy (Closes: #610457; Thanks Alex Tomlins!)
     - Always write down root partition as first physical device, otherwise
       pygrub fails (Closes: #609673)
+    - No more expect at least one option to mkfs.* calls. Fixes btrfs
+      creation.  (Closes: #609982)
   * Add dependency on openssh-client for ssh-keygen (Closes: #649108)
   * Use dh_auto_test for build time tests and add according
     build-dependencies on devscripts and libfile-slurp-perl.