diff --git a/lib/lexer.js b/lib/lexer.js
index 18c203ae2..f030d4c75 100644
--- a/lib/lexer.js
+++ b/lib/lexer.js
@@ -67,6 +67,7 @@ function Lexer(str, options) {
   };
 
   this.str = str
+    .replace(/\s+$/, '\n')
     .replace(/\r\n?/g, '\n')
     .replace(/\\ *\n/g, ' ')
     .replace(/([,:(]) *\n\s*/g, comment)
diff --git a/test/cases/whitespace.oes.css b/test/cases/whitespace.oes.css
new file mode 100644
index 000000000..4e9ab9c54
--- /dev/null
+++ b/test/cases/whitespace.oes.css
@@ -0,0 +1,4 @@
+.myclass {
+  display: block;
+  color: #000;
+}
\ No newline at end of file
diff --git a/test/cases/whitespace.oes.styl b/test/cases/whitespace.oes.styl
new file mode 100644
index 000000000..db47e757c
--- /dev/null
+++ b/test/cases/whitespace.oes.styl
@@ -0,0 +1,5 @@
+// Last line in this file has 4 spaces.
+.myclass
+  display block
+  color black
+    
\ No newline at end of file