--- __init__.py	2007-01-09 21:56:09.000000000 +0100
+++ /usr/lib/python2.4/site-packages/MoinMoin/theme/__init__.py	2007-01-10 21:04:04.000000000 +0100
@@ -1053,8 +1053,13 @@
         This is separate method to make it easy to customize the
         edtibar in sub classes.
         """
+        sub_page_name = self.request.cfg.supplementation_page_name
+        editorlink = self.editorLink(page)
+        if page.page_name.endswith(sub_page_name):
+            editorlink = editorlink.replace('action=edit','action=editsupplementation')
+            editorlink = editorlink.replace(sub_page_name,'')
 
-        editbar_items = {'Edit': self.editorLink(page),
+        editbar_items = {'Edit': editorlink,
                           self.request.cfg.supplementation_page_name:
                           self.supplementation_page_nameLink(page),
                           'Info': self.infoLink(page),