diff --git a/configure.ac b/configure.ac
index b4eddb09..a82772c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -666,19 +666,6 @@ AC_CONFIG_FILES([test/check_cue.sh], [chmod +x test/check_cue.sh])
 AC_CONFIG_FILES([test/check_iso.sh], [chmod +x test/check_iso.sh])
 AC_CONFIG_FILES([test/check_nrg.sh], [chmod +x test/check_nrg.sh])
 AC_CONFIG_FILES([test/check_paranoia.sh], [chmod +x test/check_paranoia.sh])
-
-AC_CONFIG_COMMANDS([default],[[
-# Make sure scripts are executable
-# This is a big hack, but I don't know any other way around it.
-cat > include/cdio/cdio_config.h << EOF
-/** \file cdio_config.h 
- *  \brief  configuration-time settings useful in compilation; a run-time
-    version of config.h
-*/
-EOF
-cp config.h include/cdio/cdio_config.h
-]],[[]])
-
 AC_OUTPUT
 
 AC_MSG_NOTICE([
diff --git a/include/cdio/Makefile.am b/include/cdio/Makefile.am
index fe4e7766..341fb97d 100644
--- a/include/cdio/Makefile.am
+++ b/include/cdio/Makefile.am
@@ -1,6 +1,4 @@
-#   $Id: Makefile.am,v 1.34 2008/03/20 19:02:37 karl Exp $
-#
-#   Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
+#   Copyright (C) 2003, 2004, 2006, 2008, 2011 Rocky Bernstein <rocky@gnu.org>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -24,6 +22,9 @@ if BUILD_CD_PARANOIA
 paranoiaheaders = cdda.h cdtext.h 
 endif
 
+cdio_config.h: $(top_srcdir)/config.h
+	cp  $(top_srcdir)/config.h cdio_config.h
+
 libcdioincludedir=$(includedir)/cdio
 libcdioinclude_HEADERS = \
 	audio.h \