diff --git a/ChangeLog b/ChangeLog
index ab6310e01..54bdb999d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-14  Robert Larice
+ * Makefile.am:
+	exclude libtool from `make dist', revert its recent inclusion
+ * src/xspice/Makefile.am:
+	exclude the compiled codemodels from `make dist'
+ * src/xspice/cmpp/Makefile.am:
+	eliminate an automake warning
+
 2010-06-13  Robert Larice
  * Makefile.am, src/Makefile.am:
 	add `libtool' to `make dist'
diff --git a/Makefile.am b/Makefile.am
index 527b04ca2..ee5874dfa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,7 @@ EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes  \
 		ANALYSES BUGS AUTHORS ChangeLog \
 		DEVICES NEWS README README.tcl \
 		README.adms contrib \
-		examples visualc @NOTXGRAPH@ \
-		libtool
+		examples visualc @NOTXGRAPH@
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
 			config.h.in config.sub configure install-sh \
diff --git a/src/xspice/Makefile.am b/src/xspice/Makefile.am
index f14f9c97a..b405f45af 100755
--- a/src/xspice/Makefile.am
+++ b/src/xspice/Makefile.am
@@ -15,6 +15,7 @@ dist-hook:
 	rm -rf `find $(distdir)/icm -name .cvsignore`
 	rm -rf `find $(distdir)/icm -name .deps`
 	rm -rf `find $(distdir)/icm -name *.o`
+	rm -rf `find $(distdir)/icm -name *.cm`
 
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am
index 10a9af8c8..629470696 100644
--- a/src/xspice/cmpp/Makefile.am
+++ b/src/xspice/cmpp/Makefile.am
@@ -14,10 +14,9 @@ bin_PROGRAMS = cmpp
 cmpp_SOURCES = cmpp.h main.c pp_ifs.c pp_lst.c pp_mod.c read_ifs.c util.c \
 	writ_ifs.c ifs_yacc_y.h ifs_yacc.y ifs_lex.c mod_yacc_y.h mod_yacc.y \
 	mod_lex.c
-	
-%.c : %.l
-	$(LEX)  -P$(*:lex=)yy $< > $@
-	
+
+mod_lex.c : mod_lex.l
+	$(LEX)  -Pmod_yy $< > $@
+
 ifs_lex.c : ifs_lex.l
-	$(LEX)  -i -P$(*:lex=)yy $< > $@
-	
+	$(LEX)  -i -Pifs_yy $< > $@