diff --git a/debian/changelog b/debian/changelog
index 6d7417488..78a7af001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ikiwiki (2.55) UNRELEASED; urgency=low
 
   * prefix_directives enabled in doc wiki, all preprocessor directives
     converted. (Simon McVittie)
+  * editpage: Don't show attachments link when attachments are disabled.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 21 Jul 2008 11:35:46 -0400
 
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 7f6c2a97a..987531803 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -62,8 +62,8 @@ Optional comment about this change:<br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
-<a class="toggle" href="#attachments">Attachments</a>
 <TMPL_IF NAME="FIELD-ATTACHMENT">
+<a class="toggle" href="#attachments">Attachments</a>
 <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
 <table>
 <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>