diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am
index 90133e57..b50edd12 100644
--- a/include/cdio/Makefile.am
+++ b/include/cdio/Makefile.am
@@ -25,16 +25,15 @@ endif
 cdio_config.h: $(top_srcdir)/config.h
 	echo  '#ifndef __CDIO_CONFIG_H__' > cdio_config.h
 	echo  '#define __CDIO_CONFIG_H__' >> cdio_config.h
-	cat  $(top_srcdir)/config.h >>cdio_config.h
+	cat  $(top_builddir)/config.h >>cdio_config.h
 	echo '#endif /* #ifndef CDIO_CONFIG_H */' >>cdio_config.h
 
 libcdioincludedir=$(includedir)/cdio
-libcdioinclude_HEADERS = \
+dist_libcdioinclude_HEADERS = \
 	audio.h \
 	bytesex.h \
 	bytesex_asm.h \
 	cdio.h \
-	cdio_config.h \
 	cdio_unconfig.h \
 	cd_types.h \
 	device.h \
@@ -65,6 +64,8 @@ libcdioinclude_HEADERS = \
 	xa.h \
 	$(paranoiaheaders)
 
+nodist_libcdioinclude_HEADERS = cdio_config.h
+
 EXTRA_DIST = version.h.in
 BUILT_SOURCES = version.h
 
diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am
index 9b521dee..e8cbb707 100644
--- a/src/cd-paranoia/Makefile.am
+++ b/src/cd-paranoia/Makefile.am
@@ -1,6 +1,5 @@
-#   $Id: Makefile.am,v 1.27 2008/08/31 13:38:22 flameeyes Exp $
-#
-#   Copyright (C) 2004, 2005, 2006, 2007, 2008 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2004, 2005, 2006, 2007, 2008, 
+#   Rocky Bernstein <rocky@gnu.org>
 #   Copyright (C) 1998 Monty xiphmont@mit.edu
 #
 #   This program is free software: you can redistribute it and/or modify
@@ -29,16 +28,14 @@ EXTRA_DIST = usage.txt.in usage-copy.h pod2c.pl \
 
 noinst_HEADERS = header.h report.h $(GETOPT_H)
 
-
 cd_paranoia_SOURCES = cd-paranoia.c \
 	buffering_write.c buffering_write.h \
-	header.c report.c usage.h utils.h version.h $(GETOPT_C)
+	header.c report.c utils.h version.h $(GETOPT_C)
 
 cd_paranoia_LDADD =  $(LIBCDIO_LIBS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS) $(LTLIBICONV)
 
 cd_paranoia_DEPENDENCIES =  $(LIBCDIO_DEPS) $(LIBCDIO_CDDA_LIBS) $(LIBCDIO_PARANOIA_LIBS)
 
-
 bin_PROGRAMS = cd-paranoia
 
 INCLUDES = -I$(top_srcdir) $(LIBCDIO_CFLAGS)