diff --git a/mozilla/webtools/hendrix/index.cgi b/mozilla/webtools/hendrix/index.cgi
index 412265da7f7..24f160d3f7b 100755
--- a/mozilla/webtools/hendrix/index.cgi
+++ b/mozilla/webtools/hendrix/index.cgi
@@ -130,7 +130,12 @@ if (!$action) {
}
elsif ($action eq "submit") {
# Check the poster's IP against some blacklists
- $rbl->lookup($::ENV{REMOTE_ADDR});
+ my $remote_addr = $::ENV{REMOTE_ADDR};
+
+ # RBL can't cope with IPv6 and this interacts badly with my dev box...
+ $remote_addr = "127.0.0.1" if $remote_addr eq "::1";
+
+ $rbl->lookup($remote_addr);
my %rbl_results = $rbl->txt_hash();
if (scalar(keys %rbl_results) > 0) {
$vars->{'rbl_results'} = \%rbl_results;
diff --git a/mozilla/webtools/hendrix/template/footer.html.tmpl b/mozilla/webtools/hendrix/template/footer.html.tmpl
index c142bfb9d83..274d1185b7f 100644
--- a/mozilla/webtools/hendrix/template/footer.html.tmpl
+++ b/mozilla/webtools/hendrix/template/footer.html.tmpl
@@ -23,5 +23,9 @@
# The Initial Developer wrote this software to the Glory of God.
# ***** END LICENSE BLOCK ***** %]
+
+