diff --git a/doc/ChangeLog b/doc/ChangeLog
index 898e3c6e..9deb3882 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-03  Micah Cowan  <micah@cowan.name>
+
+	* wget.texi (Download Options): --iri=no --> --no-iri
+
 2009-06-20  Micah Cowan  <micah@cowan.name>
 
 	* wget.texi (Contributors): Added Jay Krell.
diff --git a/doc/wget.texi b/doc/wget.texi
index 252548f8..07182d28 100644
--- a/doc/wget.texi
+++ b/doc/wget.texi
@@ -679,7 +679,7 @@ servers that support the @code{Range} header.
 @cindex idn support
 @item --iri
 
-Turn on internationalized URI (IRI) support. Use @samp{--iri=no} to
+Turn on internationalized URI (IRI) support. Use @samp{--no-iri} to
 turn it off. IRI support is activated by default.
 
 You can set the default state of IRI support using @code{iri} command in
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 8e209251..3e233e05 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-03  Micah Cowan  <micah@cowan.name>
+
+	* Test-ftp-iri-disabled.px, Test-iri-disabled.px:
+	--iri=no --> --no-iri
+
 2009-07-01  Micah Cowan  <micah@cowan.name>
 
 	* HTTPServer.pm (send_response): Invocation of
diff --git a/tests/Test-ftp-iri-disabled.px b/tests/Test-ftp-iri-disabled.px
index 96122867..76330b1a 100755
--- a/tests/Test-ftp-iri-disabled.px
+++ b/tests/Test-ftp-iri-disabled.px
@@ -28,7 +28,7 @@ my %urls = (
     },
 );
 
-my $cmdline = $WgetTest::WGETPATH . " --iri=no --locale=iso-8859-1 -S ftp://localhost:{{port}}/fran${ccedilla_l1}ais.txt";
+my $cmdline = $WgetTest::WGETPATH . " --no-iri --locale=iso-8859-1 -S ftp://localhost:{{port}}/fran${ccedilla_l1}ais.txt";
 
 my $expected_error_code = 0;
 
diff --git a/tests/Test-iri-disabled.px b/tests/Test-iri-disabled.px
index 02fc4d3a..01231a44 100755
--- a/tests/Test-iri-disabled.px
+++ b/tests/Test-iri-disabled.px
@@ -162,7 +162,7 @@ my %urls = (
     },
 );
 
-my $cmdline = $WgetTest::WGETPATH . " --iri=no -nH -r http://localhost:{{port}}/";
+my $cmdline = $WgetTest::WGETPATH . " --no-iri -nH -r http://localhost:{{port}}/";
 
 my $expected_error_code = 0;