diff --git a/debian/changelog b/debian/changelog
index bb501b9d8..251761633 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ ikiwiki (2.51) UNRELEASED; urgency=low
     Closes: #486592
   * creole: New plugin from Bernd Zeimetz. Closes: #486930
   * aggregate: Add template parameter.
+  * Add support for the universal edit button <http://universaleditbutton.org/>
+    (To get this on all pages of an exiting wiki, rebuild the wiki.)
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Jun 2008 15:03:33 -0400
 
diff --git a/templates/page.tmpl b/templates/page.tmpl
index b903adb19..166f3c560 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -9,6 +9,9 @@
 </TMPL_IF>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
+<TMPL_IF NAME="EDITURL">
+<link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
+</TMPL_IF>
 <TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
 <TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
 </head>