diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
index d45c24fe..ee122b97 100644
--- a/lib/coffee-script/lexer.js
+++ b/lib/coffee-script/lexer.js
@@ -171,7 +171,6 @@
           herecomment: true,
           indent: Array(this.indent + 1).join(' ')
         }));
-        this.token('TERMINATOR', '\n');
       }
       this.line += count(comment, '\n');
       return comment.length;
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
index b2b65280..ae4beffe 100644
--- a/lib/coffee-script/nodes.js
+++ b/lib/coffee-script/nodes.js
@@ -654,7 +654,7 @@
 
     Comment.prototype.compileNode = function(o, level) {
       var code;
-      code = '/*' + multident(this.comment, this.tab) + ("\n" + this.tab + "*/");
+      code = '/*' + multident(this.comment, this.tab) + ("\n" + this.tab + "*/\n");
       if ((level || o.level) === LEVEL_TOP) code = o.indent + code;
       return code;
     };
diff --git a/src/lexer.coffee b/src/lexer.coffee
index 5f6fa7d2..7eb0e234 100644
--- a/src/lexer.coffee
+++ b/src/lexer.coffee
@@ -178,7 +178,6 @@ exports.Lexer = class Lexer
     if here
       @token 'HERECOMMENT', @sanitizeHeredoc here,
         herecomment: true, indent: Array(@indent + 1).join(' ')
-      @token 'TERMINATOR', '\n'
     @line += count comment, '\n'
     comment.length
 
diff --git a/src/nodes.coffee b/src/nodes.coffee
index ba8d9320..6697df42 100644
--- a/src/nodes.coffee
+++ b/src/nodes.coffee
@@ -468,7 +468,7 @@ exports.Comment = class Comment extends Base
   makeReturn:      THIS
 
   compileNode: (o, level) ->
-    code = '/*' + multident(@comment, @tab) + "\n#{@tab}*/"
+    code = '/*' + multident(@comment, @tab) + "\n#{@tab}*/\n"
     code = o.indent + code if (level or o.level) is LEVEL_TOP
     code