diff --git a/ChangeLog b/ChangeLog
index c1096d0c3c..e07b46b079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-25  Ulrich Drepper  <drepper@redhat.com>
 
+	* posix/tst-rfc3484.c (__idna_to_unicode_lzlz): Initialize *OUTPUT.
+	* posix/tst-rfc3484-2.c (__idna_to_unicode_lzlz): Likewise.
+
 	* debug/Makefile: Disable format checking when compiling tst-chk?.c.
 
 	* config.make.in (datarootdir): Add to shut up configure.
diff --git a/posix/tst-rfc3484-2.c b/posix/tst-rfc3484-2.c
index 2536da8f87..ae802c0652 100644
--- a/posix/tst-rfc3484-2.c
+++ b/posix/tst-rfc3484-2.c
@@ -26,6 +26,7 @@ __idna_to_ascii_lz (const char *input, char **output, int flags)
 int
 __idna_to_unicode_lzlz (const char *input, char **output, int flags)
 {
+  *output = NULL;
   return 0;
 }
 
diff --git a/posix/tst-rfc3484.c b/posix/tst-rfc3484.c
index 2e74e9737f..352a7579ac 100644
--- a/posix/tst-rfc3484.c
+++ b/posix/tst-rfc3484.c
@@ -26,6 +26,7 @@ __idna_to_ascii_lz (const char *input, char **output, int flags)
 int
 __idna_to_unicode_lzlz (const char *input, char **output, int flags)
 {
+  *output = NULL;
   return 0;
 }