diff --git a/History.txt b/History.txt
index f1f72cc..4860f45 100644
--- a/History.txt
+++ b/History.txt
@@ -11,6 +11,8 @@
    -  fastcall 32-bit (MS style): registers may have hold float arguments.
    -  no 'implicit far jmp/call to near label' error in pass one; see
       group7.asm.
+   -  option -D: accept white spaces if option is enclosed in double quotes
+      ( Masm compatible ).
 
    Other changes:
    -  write listing reworked.
diff --git a/src/cmdline.c b/src/cmdline.c
index d2b9ffe..7864291 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -709,8 +709,11 @@ static const char *GetNameToken( char *dst, const char *str, int max, char type
             //if ( *str == NULLC || *str == ' ' || *str == '\t' )
             if ( *str == NULLC )
                 break;
-            /* v2.10: don't stop for white spaces if filename is expected and true cmdline is parsed */
-            if ( ( *str == ' ' || *str == '\t' ) && ( rspidx || type != '@' ) )
+            /* v2.10: don't stop for white spaces if type = '@' (filename expected) and true cmdline is parsed
+             * v2.19: don't stop for white spaces if type = '$' ( useful for -D option )
+             */
+            //if ( ( *str == ' ' || *str == '\t' ) && ( rspidx || type != '@' ) )
+            if ( ( *str == ' ' || *str == '\t' ) && ( rspidx || type == 0 ) )
                 break;
             if ( type == 0 )
                 if ( *str == '-'