diff --git a/Lib/idlelib/RstripExtension.py b/Lib/idlelib/RstripExtension.py
new file mode 100644
index 0000000..19e35d4
--- /dev/null
+++ b/Lib/idlelib/RstripExtension.py
@@ -0,0 +1,29 @@
+'Provides "Strip trailing whitespace" under the "Format" menu.'
+
+__author__ = "Roger D. Serwy <roger.serwy at gmail.com>"
+
+class RstripExtension:
+
+    menudefs = [
+        ('format', [None,
+               ('Strip trailing whitespace', '<<do-rstrip>>'),
+       ]),]
+
+    def __init__(self, editwin):
+        self.editwin = editwin
+        self.editwin.text.bind("<<do-rstrip>>", self.do_rstrip)
+
+    def do_rstrip(self, event=None):
+
+        text = self.editwin.text
+        undo = self.editwin.undo
+
+        undo.undo_block_start()
+
+        end_line = int(float(text.index('end'))) + 1
+        for cur in range(1, end_line):
+            txt = text.get('%i.0' % cur, '%i.0 lineend' % cur)
+            cut = len(txt.rstrip())
+            text.delete('%i.%i' % (cur, cut), '%i.0 lineend' % cur)
+
+        undo.undo_block_stop()
diff --git a/Lib/idlelib/config-extensions.def b/Lib/idlelib/config-extensions.def
index 2d5cf68..78b68f6 100644
--- a/Lib/idlelib/config-extensions.def
+++ b/Lib/idlelib/config-extensions.def
@@ -86,3 +86,9 @@
 fgcolor=Black
 [CodeContext_bindings]
 toggle-code-context=
+
+[RstripExtension]
+enable=1
+enable_shell=0
+enable_editor=1
+