diff --git a/config/ChangeLog b/config/ChangeLog
index 43afc18486..978a3bfd03 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-22  John Levon  <levon@movementarian.org>
+
+	* configure.ac:
+	* configure.in: support Aiksaurus 1.0
+
 2003-07-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* configure.in:
diff --git a/config/configure.ac b/config/configure.ac
index e56e31be83..2c134b819e 100644
--- a/config/configure.ac
+++ b/config/configure.ac
@@ -120,6 +120,13 @@ AC_CHECK_LIB(Aiksaurus, main,
 	[AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
 	 AIKSAURUS_LIBS="-lAiksaurus -lbz2"
 	],,"-lbz2")
+AC_CHECK_HEADER(Aiksaurus.h,[
+  ac_cv_header_aiksaurus_h=yes
+  lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
+AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
+  ac_cv_header_aiksaurus_h=yes
+  lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
+AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
 fi
 AC_SUBST(AIKSAURUS_LIBS)
 
diff --git a/config/configure.in b/config/configure.in
index bf2e3aeb14..336edfcf71 100644
--- a/config/configure.in
+++ b/config/configure.in
@@ -123,6 +123,13 @@ AC_CHECK_LIB(Aiksaurus, main,
 	[AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
 	 AIKSAURUS_LIBS="-lAiksaurus -lbz2"
 	],,"-lbz2")
+AC_CHECK_HEADER(Aiksaurus.h,[
+  ac_cv_header_aiksaurus_h=yes
+  lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
+AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
+  ac_cv_header_aiksaurus_h=yes
+  lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
+AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
 fi
 AC_SUBST(AIKSAURUS_LIBS)
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 38c15f31f8..b0a0a177c1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -130,6 +130,7 @@ src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/FormWrap.C
 src/frontends/xforms/Menubar_pimpl.C
 src/frontends/xforms/XMiniBuffer.C
+src/frontends/xforms/a.C
 src/frontends/xforms/xformsBC.h
 src/frontends/xforms/xforms_helpers.C
 src/gettext.h
diff --git a/src/ChangeLog b/src/ChangeLog
index db8b7975e8..b01306b81b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-22  John Levon  <levon@movementarian.org>
+
+	* Thesaurus.h: include the right aiksaurus header
+
 2003-07-21  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* MenuBackend.C (expand): check menu shortcuts unconditionally
diff --git a/src/Thesaurus.h b/src/Thesaurus.h
index 12bb6a7820..5f27932741 100644
--- a/src/Thesaurus.h
+++ b/src/Thesaurus.h
@@ -15,7 +15,7 @@
 
 #include "LString.h"
 #ifdef HAVE_LIBAIKSAURUS
-#include "Aiksaurus.h"
+#include AIKSAURUS_H_LOCATION
 #endif
 
 /**