--- a/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py	Tue Jul 26 20:02:21 2011 +0200
+++ b/Plugins/CheckerPlugins/Pep8/Pep8Fixer.py	Wed Jul 27 19:07:01 2011 +0200
@@ -180,7 +180,7 @@
         @return flag indicating an applied fix (boolean) and a message for
             the fix (string)
         """
-        self.__source[line - 1] = re.sub(r'[\t ]*$', "", 
+        self.__source[line - 1] = re.sub(r'[\t ]+(\r?)$', r"\1",
                                          self.__source[line - 1])
         return (True, self.trUtf8("Whitespace stripped from end of line."))