diff --git a/ChangeLog b/ChangeLog
index 6b6756c41..58dcf3d8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-21  David Shaw  <dshaw@jabberwocky.com>
+
+	* Add an acconfig.h to define EXEC_TEMPFILE_ONLY on platforms that
+	can't do fork/exec.
+
 2001-12-21  Werner Koch  <wk@gnupg.org>
 
 	* Makefile.am (dist-hook): We should also look in include for
diff --git a/acconfig.h b/acconfig.h
new file mode 100644
index 000000000..ee62ae28d
--- /dev/null
+++ b/acconfig.h
@@ -0,0 +1,5 @@
+@BOTTOM@
+
+#if !(defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID))
+#define EXEC_TEMPFILE_ONLY
+#endif