diff --git a/include/ChangeLog b/include/ChangeLog
index 19930b054..37cc4f19a 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-15  Werner Koch  <wk@g10code.com>
+
+	* util.h [!HAVE_VASPRINTF]: Add asprintf prototype.
+
 2004-10-13  David Shaw  <dshaw@jabberwocky.com>
 
 	* keyserver.h: Add KEYSERVER_TIMEOUT.
diff --git a/include/util.h b/include/util.h
index 458d13257..a2c65e497 100644
--- a/include/util.h
+++ b/include/util.h
@@ -243,6 +243,19 @@ int asprintf (char **buf, const char *fmt, ...);
 #define raise(a) kill(getpid(), (a))
 #endif
 
+/*-- Replacement functions from funcname.c --*/
+
+#if !HAVE_VASPRINTF
+int asprintf (char **result, const char *format, ...) 
+#if defined (__riscos__) \
+    || (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5 ))
+			    __attribute__ ((format (printf,2,3)))
+#endif
+     ;
+
+#endif
+
+
 /******** some macros ************/
 #ifndef STR
 #define STR(v) #v