diff --git a/ChangeLog b/ChangeLog
index fcef2221f..ca66879cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-19  Robert Larice
+ * ng-spice-rework/src/xspice/Makefile.am:
+	exclude some junk from `make dist'
+	  `make dist' and `make ; make dist'
+	should yield the same tar-ball know
+ * ng-spice-rework/src/xspice/cmpp/Makefile.am:
+	fix missing dependencies to compute ifs_yacc.h and mod_yacc.h
+	to avoid ylwrap, and because bison is neccessairy somewhere else anyway,
+	  switched from $(YACC) to $(BISON)
+
 2010-06-17 Holger Vogt
  * inpcom.c: in inp_fix_gnd_name() remove excessive white spaces 
    around 0 after replacing "gnd" by " 0 "
diff --git a/src/xspice/Makefile.am b/src/xspice/Makefile.am
index b405f45af..982f8b768 100755
--- a/src/xspice/Makefile.am
+++ b/src/xspice/Makefile.am
@@ -16,7 +16,15 @@ dist-hook:
 	rm -rf `find $(distdir)/icm -name .deps`
 	rm -rf `find $(distdir)/icm -name *.o`
 	rm -rf `find $(distdir)/icm -name *.cm`
-
+	for sub in analog digital spice2poly xtradev xtraevt ; do \
+	    rm -rf `find $(distdir)/icm/$$sub -name cmextrn.h`; \
+	    rm -rf `find $(distdir)/icm/$$sub -name cminfo.h`; \
+	    rm -rf `find $(distdir)/icm/$$sub -name udnextrn.h`; \
+	    rm -rf `find $(distdir)/icm/$$sub -name udninfo.h`; \
+	    rm -rf `find $(distdir)/icm/$$sub -name ifspec.c`; \
+	    rm -rf `find $(distdir)/icm/$$sub -name cfunc.c`; \
+	    rm -rf `find $(distdir)/icm/$$sub -name dlmain.c`; \
+	    rm -rf `find $(distdir)/icm/$$sub -name objects.inc`; \
+	done
 
 MAINTAINERCLEANFILES = Makefile.in
-
diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am
index 629470696..b1feb94e5 100644
--- a/src/xspice/cmpp/Makefile.am
+++ b/src/xspice/cmpp/Makefile.am
@@ -6,8 +6,8 @@ EXTRA_DIST = ifs_lex.l mod_lex.l ifs_yacc.h mod_yacc.h
 
 MAINTAINERCLEANFILES = Makefile.in
 
-YACC = @YACC@ -d
 LEX = @LEX@ -t
+BISON = bison
 
 bin_PROGRAMS = cmpp
 
@@ -15,8 +15,16 @@ 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
 
+mod_lex.o : mod_yacc.h
 mod_lex.c : mod_lex.l
 	$(LEX)  -Pmod_yy $< > $@
 
+ifs_lex.o : ifs_yacc.h
 ifs_lex.c : ifs_lex.l
 	$(LEX)  -i -Pifs_yy $< > $@
+
+ifs_yacc.c ifs_yacc.h : ifs_yacc.y
+	$(BISON) $(BISONFLAGS) -d -o ifs_yacc.c $<
+
+mod_yacc.c mod_yacc.h : mod_yacc.y
+	$(BISON) $(BISONFLAGS) -d -o mod_yacc.c $<