diff --git a/ChangeLog b/ChangeLog
index 20ab96d2..54b7c0aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* libltdl/m4/libtool.m4 (LT_PROG_GCJ): Avoid M4 expansion error
+	that caused `dnl' to be merged to the previous word.
+	* THANKS: Update.
+	Report by Steve Ellcey.
+
 2007-03-09  Gary V. Vaughan  <gary@gnu.org>
 
 	* libtoolize.m4sh: Replace literal tab chars in help comment
diff --git a/THANKS b/THANKS
index 59fd8855..e1ddee33 100644
--- a/THANKS
+++ b/THANKS
@@ -113,6 +113,7 @@
   Robert Ögren			lists@roboros.com
   Sebastian Wilhelmi		wilhelmi@ira.uka.de
   Stephan Kulow			coolo@kde.org
+  Steve Ellcey			sje@cup.hp.com
   Steven M. Schultz		sms@wlv.iipo.gtegsc.com
   Sven Verdoolaege		skimo@liacs.nl
   Terry D. Dontje		Terry.Dontje@Sun.COM
diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index b4613cc0..993c833a 100644
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -6844,7 +6844,7 @@ AC_DEFUN([LT_PROG_GCJ],
   [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
     [AC_CHECK_TOOL(GCJ, gcj,)
       test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-      AC_SUBST(GCJFLAGS)])])dnl
+      AC_SUBST(GCJFLAGS)])])[]dnl
 ])
 
 # Old name: