diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index b65d200a0..600318e68 100644
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -46,7 +46,7 @@ sub backlinks ($) { #{{{
 	}
 	@links = sort { $a->{page} cmp $b->{page} } @links;
 
-	return \@links, [] if @links <= $config{numbacklinks};
+	return \@links, [] if @links <= $config{numbacklinks} && ! $config{numbacklinks};
 	return [@links[0..$config{numbacklinks}-1]],
 	       [@links[$config{numbacklinks}..$#links]];
 } #}}}
diff --git a/doc/bugs/No_numbacklinks_setting_for___34__no_limit__34__.mdwn b/doc/bugs/No_numbacklinks_setting_for___34__no_limit__34__.mdwn
index 7a8d189ae..230befcdd 100644
--- a/doc/bugs/No_numbacklinks_setting_for___34__no_limit__34__.mdwn
+++ b/doc/bugs/No_numbacklinks_setting_for___34__no_limit__34__.mdwn
@@ -1 +1,4 @@
-No value for `numbacklinks` will achieve a setting of "no limit". --[[JoshTriplett]]
\ No newline at end of file
+No value for `numbacklinks` will achieve a setting of "no limit".
+--[[JoshTriplett]]
+
+0 [[done]] --[[Joey]]
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index f80b02ff1..1d545e823 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -236,7 +236,7 @@ configuration options of their own.
 * --numbacklinks n
 
   Controls how many backlinks should be displayed maximum. Excess backlinks
-  will be hidden in a popup. Default is 10.
+  will be hidden in a popup. Default is 10. Set to 0 to disable this feature.
 
 * --userdir subdir
 
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 29db5e4d3..9cead6183 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-04-06 17:19-0400\n"
+"POT-Creation-Date: 2007-04-06 19:31-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"