diff --git a/debian/changelog b/debian/changelog
index aa8effe0e..10f5ef33f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ikiwiki (2.1) UNRELEASED; urgency=low
+ikiwiki (2.1) unstable; urgency=low
 
   [ Joey Hess ]
   * Use div layout for the signin and preferences forms, so that they can be
@@ -39,8 +39,10 @@ ikiwiki (2.1) UNRELEASED; urgency=low
   * Add a destpage parameter to the filter hook.
   * Fix links to smilies generated by the smiley plugin for inlined pages. The
     old links were often wrong, but often still worked by accident.
+  * Add a test ensuring that the basewiki is self-contained and has no broken
+    links.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 17 May 2007 15:14:42 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 19 May 2007 20:37:38 -0400
 
 ikiwiki (2.00) unstable; urgency=low
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index e8d4228fa..d1431a910 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-11 15:45-0400\n"
+"POT-Creation-Date: 2007-05-19 19:33-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,8 +43,8 @@ msgstr ""
 
 #: ../IkiWiki/CGI.pm:428 ../IkiWiki/Plugin/brokenlinks.pm:24
 #: ../IkiWiki/Plugin/inline.pm:183 ../IkiWiki/Plugin/opendiscussion.pm:17
-#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:95
-#: ../IkiWiki/Render.pm:166
+#: ../IkiWiki/Plugin/orphans.pm:28 ../IkiWiki/Render.pm:91
+#: ../IkiWiki/Render.pm:171
 msgid "discussion"
 msgstr ""
 
@@ -191,7 +191,7 @@ msgstr ""
 msgid "nonexistant template %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/inline.pm:191 ../IkiWiki/Render.pm:99
+#: ../IkiWiki/Plugin/inline.pm:191 ../IkiWiki/Render.pm:95
 msgid "Discussion"
 msgstr ""
 
@@ -241,19 +241,19 @@ msgstr ""
 msgid "All pages are linked to by other pages."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:155
+#: ../IkiWiki/Plugin/passwordauth.pm:162
 msgid "Account creation successful. Now you can Login."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:158
+#: ../IkiWiki/Plugin/passwordauth.pm:165
 msgid "Error creating account."
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:179
+#: ../IkiWiki/Plugin/passwordauth.pm:186
 msgid "Failed to send mail"
 msgstr ""
 
-#: ../IkiWiki/Plugin/passwordauth.pm:181
+#: ../IkiWiki/Plugin/passwordauth.pm:188
 msgid "Your password has been emailed to you."
 msgstr ""
 
@@ -450,47 +450,47 @@ msgid ""
 "notifications"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:250 ../IkiWiki/Render.pm:270
+#: ../IkiWiki/Render.pm:255 ../IkiWiki/Render.pm:275
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:310
+#: ../IkiWiki/Render.pm:315
 #, perl-format
 msgid "removing old page %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:338
+#: ../IkiWiki/Render.pm:343
 #, perl-format
 msgid "scanning %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:343
+#: ../IkiWiki/Render.pm:348
 #, perl-format
 msgid "rendering %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:355
+#: ../IkiWiki/Render.pm:360
 #, perl-format
 msgid "rendering %s, which links to %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:372
+#: ../IkiWiki/Render.pm:377
 #, perl-format
 msgid "rendering %s, which depends on %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:410
+#: ../IkiWiki/Render.pm:415
 #, perl-format
 msgid "rendering %s, to update its backlinks"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:422
+#: ../IkiWiki/Render.pm:427
 #, perl-format
 msgid "removing %s, no longer rendered by %s"
 msgstr ""
 
-#: ../IkiWiki/Render.pm:448
+#: ../IkiWiki/Render.pm:453
 #, perl-format
 msgid "ikiwiki: cannot render %s"
 msgstr ""
diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t
new file mode 100644
index 000000000..929a560de
--- /dev/null
+++ b/t/basewiki_brokenlinks.t
@@ -0,0 +1,9 @@
+#!/usr/bin/perl
+use warnings;
+use strict;
+use Test::More tests => 2;
+
+my $ret=system("./ikiwiki.out -plugin brokenlinks -rebuild -underlaydir=basewiki t/basewiki_brokenlinks t/basewiki_brokenlinks/out");
+ok($ret == 0);
+ok(`grep 'no broken links' t/basewiki_brokenlinks/out/index.html`);
+system("rm -rf t/basewiki_brokenlinks/out t/basewiki_brokenlinks/.ikiwiki");
diff --git a/t/basewiki_brokenlinks/index.mdwn b/t/basewiki_brokenlinks/index.mdwn
new file mode 100644
index 000000000..0a6b2c39e
--- /dev/null
+++ b/t/basewiki_brokenlinks/index.mdwn
@@ -0,0 +1 @@
+[[brokenlinks ]]