diff --git a/src/cli/onevm b/src/cli/onevm
index 65d3062ec8..73b49d3efe 100755
--- a/src/cli/onevm
+++ b/src/cli/onevm
@@ -716,7 +716,7 @@ when "saveas"
     end
     
     # Build the template and allocate the new Image
-    template = "NAME=#{image_name}\n"
+    template = "NAME=\"#{image_name}\"\n"
     template << "TYPE=#{image_type}\n" if image_type