diff --git a/configure.ac b/configure.ac
index aaa4028..a399835 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl Place - Suite 330, Boston, MA  02111-1307, USA
 AC_INIT(SoundTouch, 1.8.0, [http://www.surina.net/soundtouch])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([config/m4])
-AM_CONFIG_HEADER([include/soundtouch_config.h])
+AM_CONFIG_HEADER([config.h include/soundtouch_config.h])
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 #AC_DISABLE_SHARED	dnl This makes libtool only build static libs 
diff --git a/include/soundtouch_config.h.in b/include/soundtouch_config.h.in
new file mode 100644
index 0000000..27f651b
--- /dev/null
+++ b/include/soundtouch_config.h.in
@@ -0,0 +1,8 @@
+/* Do not use x86 optimizations */
+#undef SOUNDTOUCH_DISABLE_X86_OPTIMIZATIONS
+
+/* Use Float as Sample type */
+#undef SOUNDTOUCH_FLOAT_SAMPLES
+
+/* Use Integer as Sample type */
+#undef SOUNDTOUCH_INTEGER_SAMPLES