diff --git a/autogen.sh b/autogen.sh
index aed0331a5..50deccece 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,6 @@ ADMS=0
 DIE=0
 
 
-
 help()
 {
  echo
@@ -115,48 +114,51 @@ test $TEST_TYPE $FILE || {
 }
 
 
+cp -p configure.in configure.tmp
 
 if test "$ADMS" -eq 1; then
 
-# Build admsXml arguments list
-#    for xml in `ls $XMLPATH | grep .xml`; do
-#       if [ "$xml" != "ngspiceVersion.xml" ]; then
-#	    XMLARG="$XMLARG -e ../admst/$xml"
-#	    fi
-#    done 
-
-# Prepend ngspiceVersion.xml    
-#    XMLARG="-e ../admst/ngspiceVersion.xml $XMLARG"
-
-currentdir=`pwd`
-
-for adms_dir in `ls $ADMSDIR`
-do
-  if [ -d "$ADMSDIR/$adms_dir" ]; then
-   
-   case "$adms_dir" in
-      "CVS")
-      echo "Skipping CVS"
-      ;;
-      
-      "admst")
-      echo "Skipping scripts dir"
-      
-      ;;
-      
-      *)
-      echo "Entering into directory: $adms_dir"
-      echo "-->"$ADMSDIR/$adms_dir
-      cd $ADMSDIR/$adms_dir
-      file=`ls admsva/*.va`
-      $ADMSXML $file -Iadmsva -e ../admst/ngspiceVersion.xml \
-      -e ../admst/ngspiceMakefile.am.xml
-      
-      cd $currentdir
-      ;;
-   esac
-  fi 
-done
+  # automake needs these entries in configure.in for adms enabled
+  sed 's/${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/g' configure.tmp >configure.in
+  
+  currentdir=`pwd`
+  
+  for adms_dir in `ls $ADMSDIR`
+  do
+    if [ -d "$ADMSDIR/$adms_dir" ]; then
+     
+     case "$adms_dir" in
+        "CVS")
+        echo "Skipping CVS"
+        ;;
+        
+        "admst")
+        echo "Skipping scripts dir"
+        
+        ;;
+        
+        *)
+        echo "Entering into directory: $adms_dir"
+        echo "-->"$ADMSDIR/$adms_dir
+        cd $ADMSDIR/$adms_dir
+        file=`ls admsva/*.va`
+        $ADMSXML $file -Iadmsva -e ../admst/ngspiceVersion.xml \
+        -e ../admst/ngspiceMakefile.am.xml
+        
+        cd $currentdir
+        ;;
+     esac
+    fi 
+  done
+
+else
+
+  sed '/${VLAMKF}/d' configure.tmp >configure.in
+
 fi
 
 echo "Running libtoolize"
@@ -183,4 +185,6 @@ echo "Running autoconf"
 autoconf
 if [ $? -ne 0 ]; then  echo "autoconf failed"; exit 1 ; fi
 
+mv configure.tmp configure.in
+
 echo "Success."
diff --git a/configure.in b/configure.in
index 71876619b..b6eb42f98 100644
--- a/configure.in
+++ b/configure.in
@@ -843,6 +843,12 @@ if test "$enable_adms" = "yes"; then
                adms/ekv \
                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 "
+
    NOTVLADEVDIR=""
 
    VLADEV=" spicelib/devices/adms/hicum0/libhicum0.la \
@@ -853,11 +859,15 @@ if test "$enable_adms" = "yes"; then
 
 else
 
+    VLAMKF=""
     VLADEVDIR=""
     NOTVLADEVDIR="adms"
+
 fi
+
 AC_SUBST(ADMSXML)
 AC_SUBST(VLADEVDIR)
+AC_SUBST(VLAMKF)
 AC_SUBST(VLADEV)
 AC_SUBST(NOTVLADEVDIR)
 
@@ -951,6 +961,7 @@ AC_CONFIG_FILES([Makefile
                  src/spicelib/Makefile
                  src/spicelib/analysis/Makefile
                  src/spicelib/devices/Makefile
+                 ${VLAMKF}
                  src/spicelib/devices/asrc/Makefile
                  src/spicelib/devices/bjt/Makefile
                  src/spicelib/devices/bjt2/Makefile