diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index b19a66a2d..b68acb639 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -2522,7 +2522,7 @@ See: <tt><ref id=".ASCIIZ" name=".ASCIIZ"></tt>,<tt><ref id=".CHARMAP" name=".CH
 
 <sect1><tt>.ENDMAC, .ENDMACRO</tt><label id=".ENDMACRO"><p>
 
-  Marks the end of a macro definition. Note, <tt>.ENDMACRO</tt> should be on 
+  Marks the end of a macro definition. Note, <tt>.ENDMACRO</tt> should be on
   its own line to successfully end the macro definition. It is possible to use
   <tt><ref id=".DEFINE" name=".DEFINE"></tt> to create a symbol that references
   <tt>.ENDMACRO</tt> without ending the macro definition.
diff --git a/src/ca65/macro.c b/src/ca65/macro.c
index 72436fdec..6e059f421 100644
--- a/src/ca65/macro.c
+++ b/src/ca65/macro.c
@@ -394,14 +394,14 @@ void MacDef (unsigned Style)
     int HaveParams;
     int LastTokWasSep;
 
-    /* For classic macros, remember if we are at the beginning of the line. 
-    ** If the macro name and parameters pass our checks then we will be on a 
-    ** new line, so set it now  
+    /* For classic macros, remember if we are at the beginning of the line.
+    ** If the macro name and parameters pass our checks then we will be on a
+    ** new line, so set it now
     */
     LastTokWasSep = 1;
 
-    /* Save the position of the start of the macro definition to allow 
-    ** using Perror to display the error if .ENDMACRO isn't found 
+    /* Save the position of the start of the macro definition to allow
+    ** using Perror to display the error if .ENDMACRO isn't found
     */
     Pos = CurTok.Pos;
 
@@ -504,8 +504,8 @@ void MacDef (unsigned Style)
     while (1) {
         /* Check for end of macro */
         if (Style == MAC_STYLE_CLASSIC) {
-            /* In classic macros, if .endmacro is not at the start of the line 
-            ** it will be added to the macro definition instead of closing it. 
+            /* In classic macros, if .endmacro is not at the start of the line
+            ** it will be added to the macro definition instead of closing it.
             */
             if (CurTok.Tok == TOK_ENDMACRO && LastTokWasSep) {
                 /* Done */
@@ -588,8 +588,8 @@ void MacDef (unsigned Style)
         }
         ++M->TokCount;
 
-        /* Save if last token was a separator to know if .endmacro is at 
-        ** the start of a line 
+        /* Save if last token was a separator to know if .endmacro is at
+        ** the start of a line
         */
         LastTokWasSep = TokIsSep(CurTok.Tok);
 
diff --git a/test/asm/err/bug2013.s b/test/asm/err/bug2013.s
new file mode 100644
index 000000000..8907675fb
--- /dev/null
+++ b/test/asm/err/bug2013.s
@@ -0,0 +1,6 @@
+; for PR #2013
+; should produce error output:
+; ... Error: '.ENDMACRO' expected for macro 'test'
+
+.macro test
+    nop .endmacro
diff --git a/test/asm/val/bug2013.s b/test/asm/val/bug2013.s
new file mode 100644
index 000000000..b6e9e37e6
--- /dev/null
+++ b/test/asm/val/bug2013.s
@@ -0,0 +1,30 @@
+; for PR #2013
+    .import _exit
+    .export _main
+
+    ; this macro is invalid, but should not cause an error (if it is never expanded)
+    .macro invalid
+        nop .endmacro
+    .endmacro
+
+    .define temp_endmac .endmacro
+    .macro new_mac
+        .define startmac .macro
+        .define endmac .endmacro
+    temp_endmac
+
+    .undefine temp_endmac
+
+    new_mac
+
+    startmac dex2
+        dex
+        dex
+    endmac
+
+_main:
+    ldx #$02
+    dex2
+    ; x should be zero
+    txa
+    jmp _exit
\ No newline at end of file