diff --git a/ChangeLog b/ChangeLog
index a94d40ac5..9ae458559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-15  Holger Vogt
+ * configure.in: add a small section starting with *VLAMKF, containing
+   the adms makefiles to be made 
+ * autogen.sh:  if --adms is selected, read the section from configure.in
+   and store it in AC_CONFIG_FILES of temporary configure.ac 
+ Tested with MINGW, CYGWIN, SUSE Linux, may need more tests on other OSs!  
+
 2010-08-15  Robert Larice
  * src/misc/string.c ,
  * src/xspice/cmpp/mod_yacc.y :
diff --git a/autogen.sh b/autogen.sh
index b2e8e0498..488bc7761 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -138,14 +138,21 @@ if test "$ADMS" -eq 1; then
 
   # automake needs these entries in configure.in for adms enabled
   
-  sed 's/tests\/vbic\/Makefile/tests\/vbic\/Makefile\
-                 src\/spicelib\/devices\/adms\/ekv\/Makefile\
-                 src\/spicelib\/devices\/adms\/hicum0\/Makefile\
-                 src\/spicelib\/devices\/adms\/hicum2\/Makefile\
-                 src\/spicelib\/devices\/adms\/mextram\/Makefile\
-                 src\/spicelib\/devices\/adms\/psp102\/Makefile/g' configure.temp >configure.ac
+#  sed 's/tests\/vbic\/Makefile/tests\/vbic\/Makefile\
+#                src\/spicelib\/devices\/adms\/ekv\/Makefile\
+#               src\/spicelib\/devices\/adms\/hicum0\/Makefile\
+#                 src\/spicelib\/devices\/adms\/hicum2\/Makefile\
+#                 src\/spicelib\/devices\/adms\/mextram\/Makefile\
+#                 src\/spicelib\/devices\/adms\/psp102\/Makefile/g' configure.temp >configure.ac
   
-#  cp -p configure.ac configure.test
+  z=""
+  # Find all lines with "#VLAMKF" and put the second token of each line into shell variable z
+  z=`cat configure.temp | awk -v z=${z} '$1 ~ /#VLAMKF/{ z=$2; print "                 "z"\\\" }' `
+
+  # Find "tests/vbic/Makefile" and replace by tests/vbic/Makefile plus contents of variable z
+  sed -e "
+  s,tests\\/vbic\\/Makefile,tests\\/vbic\\/Makefile\\
+  $z ," configure.temp >configure.ac
   
   currentdir=`pwd`
   
diff --git a/configure.in b/configure.in
index 5aea923c2..b6a46aaa1 100644
--- a/configure.in
+++ b/configure.in
@@ -933,11 +933,12 @@ if test "$enable_adms" = "yes"; then
                adms/mextram \
                adms/psp102 "
    
-#   VLAMKF=" src/spicelib/devices/adms/ekv/Makefile \
-#            src/spicelib/devices/adms/hicum0/Makefile \
-#            src/spicelib/devices/adms/hicum2/Makefile \
-#            src/spicelib/devices/adms/mextram/Makefile \
-#            src/spicelib/devices/adms/psp102/Makefile "
+dnl The makefiles for adms (to be added to AC_CONFIG_FILES by ./autogen.sh --adms)  
+#VLAMKF    src/spicelib/devices/adms/ekv/Makefile
+#VLAMKF    src/spicelib/devices/adms/hicum0/Makefile
+#VLAMKF    src/spicelib/devices/adms/hicum2/Makefile
+#VLAMKF    src/spicelib/devices/adms/mextram/Makefile
+#VLAMKF    src/spicelib/devices/adms/psp102/Makefile
 
    NOTVLADEVDIR=""
 
@@ -949,7 +950,6 @@ if test "$enable_adms" = "yes"; then
 
 else
 
-#    VLAMKF=""
     VLADEVDIR=""
     NOTVLADEVDIR="adms"
 
@@ -957,7 +957,6 @@ fi
 
 AC_SUBST(ADMSXML)
 AC_SUBST(VLADEVDIR)
-#AC_SUBST(VLAMKF)
 AC_SUBST(VLADEV)
 AC_SUBST(NOTVLADEVDIR)