diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index b63c8e245..7d9eca3af 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -120,7 +120,7 @@ sub import (@) {
 			print "Confirm password: ";
 			chomp($password2=<STDIN>);
 
-			last if  $password2 ne $password;
+			last if $password2 eq $password;
 
 			print "Password mismatch.\n\n";
 		}
diff --git a/debian/changelog b/debian/changelog
index 4e62b0971..82445e837 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.06) UNRELEASED; urgency=low
+
+  * Setup automator: Fix bug in password comparison. Closes: #517654
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 01 Mar 2009 15:00:39 -0500
+
 ikiwiki (3.05) unstable; urgency=low
 
   * debhelper v7(.0.50); rules file minimisation.