diff --git a/Makefile.am b/Makefile.am
index 7c018f4c3..4c35a8a47 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = FAQ autogen.sh Stuarts_Poly_Notes  \
 		README.adms contrib \
 		doc examples m4 visualc @NOTXGRAPH@ \
 		xgraph/aclocal.m4 \
-		compile_min.sh
+		compile_min.sh .gitignore
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 ar-lib compile config.guess \
 			src/include/ngspice/config.h.in config.sub configure install-sh \
diff --git a/src/xspice/Makefile.am b/src/xspice/Makefile.am
index ad2de1ea2..2a1299dcd 100644
--- a/src/xspice/Makefile.am
+++ b/src/xspice/Makefile.am
@@ -1,6 +1,6 @@
 # Process this file with automake
 
-EXTRA_DIST = README examples icm xspice.c
+EXTRA_DIST = README examples icm xspice.c .gitignore
 
 ## This is removed because icm relies upon the existance of all other
 ## libs.  It is currently compiled manually, last.
diff --git a/src/xspice/cmpp/Makefile.am b/src/xspice/cmpp/Makefile.am
index fa03d5ffe..7ee6f280e 100644
--- a/src/xspice/cmpp/Makefile.am
+++ b/src/xspice/cmpp/Makefile.am
@@ -2,7 +2,7 @@
 
 BUILT_SOURCES = ifs_lex.c ifs_yacc.c ifs_yacc.h mod_lex.c mod_yacc.c mod_yacc.h
 
-EXTRA_DIST = ifs_lex.l mod_lex.l ifs_yacc.h mod_yacc.h
+EXTRA_DIST = ifs_lex.l mod_lex.l ifs_yacc.h mod_yacc.h .gitignore
 
 MAINTAINERCLEANFILES = Makefile.in
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f05e2ca2c..d90a6c40e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,13 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = bsim3		\
-	bsim4		\
-	bsimsoi		\
-	hisim		\
-	hisimhv
-
-
-DIST_SUBDIRS = bsim3	\
+SUBDIRS =		\
+	bsim3		\
 	bsim4		\
 	bsimsoi		\
 	hisim		\
@@ -17,12 +11,38 @@ if XSPICE_WANTED
 SUBDIRS += xspice
 endif
 
-DIST_SUBDIRS += xspice
 
-TESTS_ENVIRONMENT = $(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice
+DIST_SUBDIRS =		\
+	bsim1		\
+	bsim2		\
+	bsim3		\
+	bsim3soidd	\
+	bsim3soifd	\
+	bsim3soipd	\
+	bsim4		\
+	bsimsoi		\
+	filters		\
+	general		\
+	hfet		\
+	hisim		\
+	hisimhv		\
+	jfet		\
+	mes		\
+	mesa		\
+	mos6		\
+	polezero	\
+	resistance	\
+	sensitivity	\
+	transient	\
+	transmission	\
+	vbic		\
+	xspice
+
+
+TESTS_ENVIRONMENT = \
+	$(SHELL) $(top_srcdir)/tests/bin/check.sh $(top_builddir)/src/ngspice
 
 EXTRA_DIST = \
-	README bin
-
+	README bin .gitignore
 
 MAINTAINERCLEANFILES = Makefile.in