diff --git a/g10/ChangeLog b/g10/ChangeLog
index ad72d5078..3b37911bc 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-22  Werner Koch  <wk@g10code.com>
+
+	* sig-check.c (signature_check2): Changed warning URL to include faq.
+	* misc.c (idea_cipher_warn): Ditto.
+
 2006-03-22  David Shaw  <dshaw@jabberwocky.com>
 
 	* mainproc.c (get_pka_address): Fix bug introduced as part of
diff --git a/g10/misc.c b/g10/misc.c
index 74d05cb56..fbe449299 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -445,8 +445,8 @@ idea_cipher_warn(int show)
   if(!warned || show)
     {
       log_info(_("the IDEA cipher plugin is not present\n"));
-      log_info(_("please see http://www.gnupg.org/why-not-idea.html "
-		 "for more information\n"));
+      log_info(_("please see %s for more information\n"),
+               "http://www.gnupg.org/faq/why-not-idea.html");
       warned=1;
     }
 }
diff --git a/g10/sig-check.c b/g10/sig-check.c
index f09711e12..d576769da 100644
--- a/g10/sig-check.c
+++ b/g10/sig-check.c
@@ -101,7 +101,7 @@ signature_check2( PKT_signature *sig, MD_HANDLE digest, u32 *r_expiredate,
 		log_info(_("WARNING: signing subkey %s is not"
 			   " cross-certified\n"),keystr_from_pk(pk));
 		log_info(_("please see %s for more information\n"),
-			 "http://www.gnupg.org/subkey-cross-certify.html");
+			 "http://www.gnupg.org/faq/subkey-cross-certify.html");
 		/* --require-cross-certification makes this warning an
                      error.  TODO: change the default to require this
                      after more keys have backsigs. */