diff --git a/ChangeLog b/ChangeLog
index 2da01a28..e38a6089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-23  Lennart Poettering  <lennart@poettering.net>  (tiny change)
+
+	Shut up prototype warnings with recent GCC and -Wstrict-prototypes.
+	* libltdl/config/ltmain.m4sh (func_generate_dlsyms): Use recent
+	GCC's diagnostic pragma to override a -Wstrict-prototypes
+	setting for the symbol list code.
+	* THANKS: Update.
+
 2009-08-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Remove __oline__ from macros, for less spurious configure diffs.
diff --git a/THANKS b/THANKS
index 70e299de..e976ba87 100644
--- a/THANKS
+++ b/THANKS
@@ -110,6 +110,7 @@
   John R. Cary			cary@txcorp.com
   John Wolfe			jlw@sco.com
   Joseph Beckenbach III		jrb3@best.com
+  Lennart Poettering		lennart@poettering.net
   Karl Berry			karl@freefriends.org
   Kenneth Albanowski		kjahds@kjahds.com
   Kevin Ryde			user42@zip.com.au
diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index ebd3909c..9e4cfdb7 100644
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1946,6 +1946,10 @@ func_generate_dlsyms ()
 extern \"C\" {
 #endif
 
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
 /* External symbol declarations for the compiler. */\
 "