diff --git a/lib/lexer.js b/lib/lexer.js
index e8990d72..756c64c0 100644
--- a/lib/lexer.js
+++ b/lib/lexer.js
@@ -39,7 +39,7 @@
     // unless explicitly asked not to.
     Lexer.prototype.tokenize = function tokenize(code, options) {
       var o;
-      code = code.replace(/\r/g, '');
+      code = code.replace(/(\r|\s+$)/g, '');
       o = options || {};
       this.code = code;
       // The remainder of the source code.
diff --git a/src/lexer.coffee b/src/lexer.coffee
index 9e654c56..75152e59 100644
--- a/src/lexer.coffee
+++ b/src/lexer.coffee
@@ -43,7 +43,7 @@ exports.Lexer: class Lexer
   # Before returning the token stream, run it through the [Rewriter](rewriter.html)
   # unless explicitly asked not to.
   tokenize: (code, options) ->
-    code     : code.replace(/\r/g, '')
+    code     : code.replace(/(\r|\s+$)/g, '')
     o        : options or {}
     @code    : code         # The remainder of the source code.
     @i       : 0            # Current character position we're parsing.