diff --git a/.cvsignore b/.cvsignore
index dff2e46..6317e06 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,5 +1,5 @@
 configure
-config.status
+config.status*
 config.log
 autom4te.cache
 aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 3d063da..2921812 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,10 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = libcpp libiberty src doc tools
 
+# gcc directories aren't automake-friendly
+DIST_SUBDIRS = src doc tools
+gcc_SUBDIRS = include libcpp libiberty
+
 src: libcpp libiberty
 
 EXTRA_DIST =					\
@@ -9,4 +13,16 @@ EXTRA_DIST =					\
 	COPYRIGHT				\
 	INSTALL					\
 	INTEL-LICENSE				\
-	README
+	README					\
+	config-aux/acx.m4			\
+	config-aux/codeset.m4			\
+	config-aux/gettext-sister.m4		\
+	config-aux/move-if-change		\
+	config-aux/no-executables.m4		\
+	config-aux/warnings.m4
+
+dist-hook:
+	for i in $(gcc_SUBDIRS); do \
+	  (cd $$i; make distclean); \
+	  tar cf - -X $$i/.distignore $$i | tar xf - -C $(distdir); \
+	done
diff --git a/doc/.cvsignore b/doc/.cvsignore
index c3dc78c..18ef971 100644
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -5,3 +5,4 @@ ref.bbl
 ref.blg
 ref.dvi
 ref.log
+ref.out
diff --git a/include/.distignore b/include/.distignore
new file mode 100644
index 0000000..b86c55f
--- /dev/null
+++ b/include/.distignore
@@ -0,0 +1,4 @@
+CVS
+.cvsignore
+.distignore
+*~
diff --git a/libcpp/.cvsignore b/libcpp/.cvsignore
index 7e68cde..f1c90fa 100644
--- a/libcpp/.cvsignore
+++ b/libcpp/.cvsignore
@@ -1,6 +1,6 @@
 .deps
 Makefile
-config.status
+config.status*
 configure
 config.in
 config.log
diff --git a/libcpp/.distignore b/libcpp/.distignore
new file mode 100644
index 0000000..20c685f
--- /dev/null
+++ b/libcpp/.distignore
@@ -0,0 +1,5 @@
+CVS
+.cvsignore
+.distignore
+.deps
+*~
diff --git a/libiberty/.cvsignore b/libiberty/.cvsignore
index a8b642f..6498dc6 100644
--- a/libiberty/.cvsignore
+++ b/libiberty/.cvsignore
@@ -1,7 +1,8 @@
 .deps
 Makefile
-config.status
+config.status*
 configure
+configure.lineno
 config.in
 config.log
 stamp-h1
diff --git a/libiberty/.distignore b/libiberty/.distignore
new file mode 100644
index 0000000..2d3b7a7
--- /dev/null
+++ b/libiberty/.distignore
@@ -0,0 +1,7 @@
+CVS
+.cvsignore
+.distignore
+.deps
+autom4te.cache
+temp-frag
+*~
diff --git a/nregress/misc/intf1/test.nc b/nregress/misc/intf1/test.nc
index 3864556..ec498b7 100644
--- a/nregress/misc/intf1/test.nc
+++ b/nregress/misc/intf1/test.nc
@@ -12,7 +12,7 @@ MOTOR_OFF = 0
 * Init.
 * @return Always returns SUCCESS.
 */
-command result_t init();
+command void init();
 
 }
 
diff --git a/src/.cvsignore b/src/.cvsignore
index f53d0e1..211fd5e 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -26,7 +26,7 @@ config.cache
 autoconf.h
 autoconf.h.in
 config.log
-config.status
+config.status*
 config-aux
 configure
 parser
@@ -39,3 +39,4 @@ stamp-h.in
 nesc1
 autom4te.cache
 stamp-h1
+.gdb_history
diff --git a/src/Makefile.am b/src/Makefile.am
index fe1b37d..34b4281 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -95,6 +95,7 @@ libparser_a_SOURCES =				\
 	expr.h					\
 	flags.c					\
 	flags.h					\
+	gcc-cpp.h				\
 	graph.c					\
 	graph.h					\
 	init.c					\