diff --git a/gas/ChangeLog b/gas/ChangeLog
index a1bb6ddf22..f4344c062a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,7 @@
 Sat Nov 22 15:50:09 1997  Klaus Kaempf  <kkaempf@progis.de>
 
+	* config-gas.com: Get version info from configure.in.
+
 	* makefile.vms: include depend.obj in OBJS.
 
 	* config/tc-alpha.c (s_alpha_section): Remove ".lcomm" handling.
diff --git a/gas/config-gas.com b/gas/config-gas.com
index bba91568a3..0533d12e49 100644
--- a/gas/config-gas.com
+++ b/gas/config-gas.com
@@ -40,16 +40,15 @@ $!
 $! Create the file version.opt, which helps identify the executable.
 $!
 $if f$trnlnm("IFILE$").nes."" then  close/noLog ifile$
-$search Makefile.in "VERSION="/Exact/Output=config-gas-tmp.tmp
+$search CONFIGURE.IN "AM_INIT_AUTOMAKE"/Exact/Output=config-gas-tmp.tmp
 $open ifile$ config-gas-tmp.tmp
 $read ifile$ line
 $close ifile$
 $DELETE config-gas-tmp.tmp;*
-$! Discard "VERSION=" and "\n" parts.
-$ijk=f$locate("=",line)+1
+$! Discard "AM_INIT_AUTOMAKE(gas, " and ")" parts.
+$ijk=f$locate(",",line)+2
 $line=f$extract(ijk,f$length(line)-ijk,line)
-$! [what "\n" part??  this seems to be useless, but is benign]
-$ijk=f$locate("\n",line)
+$ijk=f$locate(")",line)
 $line=f$extract(0,ijk,line)
 $!
 $ if f$search("version.opt").nes."" then DELETE version.opt;*
@@ -64,8 +63,8 @@ $ if f$search("config.h").nes."" then DELETE config.h;*
 $copy _NL: config.h
 $open/Append ifile$ config.h
 $write ifile$ "/* config.h.  Generated by config-gas.com. */
-$write ifile$ "#ifndef GAS_VERSION"
-$write ifile$ "#define GAS_VERSION      """,line,""""
+$write ifile$ "#ifndef VERSION"
+$write ifile$ "#define VERSION      """,line,""""
 $write ifile$ "#endif"
 $write ifile$ "/*--*/"
 $if arch .eqs. "VAX"