diff --git a/tests/ChangeLog b/tests/ChangeLog
index f75387757..f12d9afbe 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-08  Marcus Brinkmann  <marcus@g10code.de>
+
+	* asschk.c (__func__) [__STDC_VERSION__ < 199901L && __GNUC__ >= 2]:
+	Define macro to __FUNCTION__.
+	(die): Use __func__ instead of __FUNCTION__.
+
 2005-10-07  Marcus Brinkmann  <marcus@g10code.de>
 
 	* Makefile.am (TESTS_ENVIRONMENT): Remove LD_LIBRARY_PATH hack.
diff --git a/tests/asschk.c b/tests/asschk.c
index 59c0d107a..6a05fe1a8 100644
--- a/tests/asschk.c
+++ b/tests/asschk.c
@@ -116,6 +116,18 @@
 # define ATTR_PRINTF(f,a)
 #endif
 
+#if __STDC_VERSION__ < 199901L
+# if __GNUC__ >= 2
+#  define __func__ __FUNCTION__
+# else
+/* Let's try our luck here.  Some systems may provide __func__ without
+   providing __STDC_VERSION__ 199901L.  */
+#  if 0
+#   define __func__ "<unknown>"
+#  endif
+# endif
+#endif
+
 #define spacep(p) (*(p) == ' ' || *(p) == '\t')
 
 #define MAX_LINELEN 2048
@@ -188,7 +200,7 @@ die (const char *format, ...)
   exit (1);
 }
 
-#define die(format, args...) (die) ("%s: " format, __FUNCTION__ , ##args)
+#define die(format, args...) (die) ("%s: " format, __func__ , ##args)
 
 static void
 err (const char *format, ...)