diff --git a/config/ChangeLog b/config/ChangeLog
index 27f6542fee..1f06f37bd6 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,6 +1,11 @@
+2002-11-06  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+	* configure.ac: use AH_TOP and AH_BOTTOM instead of
+	AH_VERBATIM
+
 2002-11-05  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
-	* configure.ac (AH_VERBATIM): fix keys to be unique 
+	* configure.ac (AH_VERBATIM): fix keys to be unique
 
 2002-11-04  Lars Gullik Bjønnes  <larsbj@birdstep.com>
 
diff --git a/config/configure.ac b/config/configure.ac
index 7ac7451854..b76bb7f129 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -290,39 +290,49 @@ AC_SUBST(VERSION_INFO)
 
 ## Some config.h stuff
 
-AH_VERBATIM([HAVE_STRCHR2],
-[
+AH_TOP([
+/* -*- C++ -*- */
+/* This is the compilation configuration file for LyX. It was generated by
+   autoconf's configure. You might want to change some of the defaults if
+   something goes wrong during the compilation
+
+   * This file is part of
+   * ======================================================
+   *
+   *           LyX, the High Level Word Processor
+   *
+   *           Copyright 1995 Matthias Ettrich
+   *           Copyright 1995-2001 The LyX Team.
+   *
+   *======================================================*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+])
+
+AH_BOTTOM([
+/************************************************************
+ ** You should not need to change anything beyond this point */
+
 #ifndef HAVE_STRCHR
 # define strchr(a,b)    index(a,b)
 #endif
-])
 
-AH_VERBATIM([HAVE_MEMMOVE2],
-[
 #ifndef HAVE_MEMMOVE
 # define memmove(a,b,c) bcopy(b,a,c)
 #endif
-])
 
-AH_VERBATIM([HAVE_STRERROR2],
-[
 #ifndef HAVE_STRERROR
 #if defined(__cplusplus)
 extern "C"
 #endif
 char * strerror(int n);
 #endif
-])
 
-AH_VERBATIM([BROKEN_HEADERS2],
-[
 #ifdef BROKEN_HEADERS
 #include "broken_headers.h"
 #endif
-])
 
-AH_VERBATIM([HAVE_MKSTEMP2],
-[
 #ifdef HAVE_MKSTEMP
 #ifndef HAVE_DECL_MKSTEMP
 #if defined(__cplusplus)
@@ -331,19 +341,15 @@ extern "C"
 int mkstemp(char*);
 #endif
 #endif
-])
 
-AH_VERBATIM([__EMX__2],
-[
 #ifdef __EMX__
 #include "support/os2_defines.h"
 #endif
-])
 
-AH_VERBATIM([__CYGWIN__2],
-[
 #if defined(__CYGWIN__) || defined(__CYGWIN32__)
 #include "support/nt_defines.h"
+#endif
+
 #endif
 ])