diff --git a/autogen.sh b/autogen.sh
index ec69b9d84..ab9560636 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -128,11 +128,11 @@ if test "$ADMS" -eq 1; then
 # Prepend ngspiceVersion.xml    
 #    XMLARG="-e ../admst/ngspiceVersion.xml $XMLARG"
 
-for file in `ls $ADMSDIR`
+for adms_dir in `ls $ADMSDIR`
 do
-  if [ -d "$ADMSDIR/$file" ]; then
+  if [ -d "$ADMSDIR/$adms_dir" ]; then
    
-   case "$file" in
+   case "$adms_dir" in
       "CVS")
       echo "Skipping CVS"
       ;;
@@ -143,13 +143,12 @@ do
       ;;
       
       *)
-      echo "Entering into directory: $file"
-      cd $ADMSDIR/$file
-      $ADMSXML  admsva/$file.va -Iadmsva -e ../admst/ngspiceVersion.xml \
+      echo "Entering into directory: $adms_dir"
+      cd $ADMSDIR/$adms_dir
+      file=`ls admsva/*.va`
+      $ADMSXML $file -Iadmsva -e ../admst/ngspiceVersion.xml \
       -e ../admst/ngspiceMakefile.am.xml
       
-#       $ADMSXML admsva/$file.va -Iadmsva ${XMLARG}
-      
       cd -
       ;;
    esac
diff --git a/configure.in b/configure.in
index 083567bef..0e1735b78 100644
--- a/configure.in
+++ b/configure.in
@@ -707,7 +707,6 @@ src/spinit			\
 src/spicelib/Makefile		\
 src/spicelib/analysis/Makefile	\
 src/spicelib/devices/Makefile		\
-src/spicelib/devices/adms/c/Makefile	\
 src/spicelib/devices/adms/hicum0/Makefile	\
 src/spicelib/devices/adms/mextram/Makefile	\
 src/spicelib/devices/asrc/Makefile	\