diff --git a/src/ChangeLog b/src/ChangeLog
index bd833ea0..1e3a9363 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2009-06-29  Micah Cowan  <micah@cowan.name>
+
+	* retr.c (retrieve_from_file): Be sure to pass iri information
+	when parsing an input-fle url, and be sure to hand a clean iri
+	struct, off to retrieve_tree and retrieve_url.
+
+	* iri.c, iri.h (iri_dup): Added.
+
+	* retr.c (retrieve_url): Re-parse for IRI fallback.
+
+	* main.c (main): Set up iri before the url_parse invocation (so we
+	can use it).
+
 2009-06-20  Jay Krell  <jay.krell@cornell.edu>
 
 	* sysdep.h (_ALL_SOURCE): (small change) Define the _ALL_SOURCE
diff --git a/tests/Test-ftp-iri.px b/tests/Test-ftp-iri.px
index c7119482..78e2622c 100755
--- a/tests/Test-ftp-iri.px
+++ b/tests/Test-ftp-iri.px
@@ -25,7 +25,7 @@ my %urls = (
     },
 );
 
-my $cmdline = $WgetTest::WGETPATH . " --debug --locale=iso-8859-1 -S ftp://localhost:{{port}}/fran${ccedilla_l1}ais.txt";
+my $cmdline = $WgetTest::WGETPATH . " --locale=iso-8859-1 -S ftp://localhost:{{port}}/fran${ccedilla_l1}ais.txt";
 
 my $expected_error_code = 0;