diff --git a/etc/glance-image-import.conf.sample b/etc/glance-image-import.conf.sample
index fd27ad0303..19a64207e4 100644
--- a/etc/glance-image-import.conf.sample
+++ b/etc/glance-image-import.conf.sample
@@ -20,7 +20,7 @@
 # Possible values:
 #     * qcow2
 #     * raw
-#     * vdmk
+#     * vmdk
 #
 # Related Options:
 #     * disk_formats
@@ -28,7 +28,7 @@
 # Possible values:
 # qcow2 - <No description provided>
 # raw - <No description provided>
-# vdmk - <No description provided>
+# vmdk - <No description provided>
 #output_format = raw
 
 
@@ -60,6 +60,10 @@
 #     * Any provided Task object name to be included
 #       in to the flow.
 #  (list value)
+#
+# This option has a sample default set, which means that
+# its actual default value may vary from the one documented
+# below.
 #image_import_plugins = [no_op]
 
 
diff --git a/glance/async_/flows/plugins/image_conversion.py b/glance/async_/flows/plugins/image_conversion.py
index b580759c31..3bfbc4a42e 100644
--- a/glance/async_/flows/plugins/image_conversion.py
+++ b/glance/async_/flows/plugins/image_conversion.py
@@ -32,7 +32,7 @@ LOG = logging.getLogger(__name__)
 conversion_plugin_opts = [
     cfg.StrOpt('output_format',
                default='raw',
-               choices=('qcow2', 'raw', 'vdmk'),
+               choices=('qcow2', 'raw', 'vmdk'),
                help=_("""
 Desired output format for image conversion plugin.
 
@@ -46,7 +46,7 @@ the conversion and import will fail.
 Possible values:
     * qcow2
     * raw
-    * vdmk
+    * vmdk
 
 Related Options:
     * disk_formats