--- /dev/null
+--- sidplay-libs-2.1.1.orig/configure.ac
++++ sidplay-libs-2.1.1/configure.ac
+@@ -2,7 +2,7 @@ AC_INIT(Makefile.am)
+
+ #Variables
+ pwd=`pwd`
+-builders='${libdir}'/sidplay/builders
++builders='${libdir}'/
+ ac_configure_args="$ac_configure_args --disable-library-checks"
+
+ AC_CONFIG_AUX_DIR(unix)
+--- sidplay-libs-2.1.1.orig/libsidplay/configure.ac
++++ sidplay-libs-2.1.1/libsidplay/configure.ac
+@@ -5,6 +5,9 @@ m4_define([LIBAGE],0)
+
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(libsidplay,2.LIBCUR.LIBREV)
++m4_include([unix/ac_compile_check_sizeof.m4])
++m4_include([unix/ac_create_stdint_h.m4])
++m4_include([unix/my_macros.m4])
+ AC_CONFIG_HEADER(unix/config.h)
+ AC_CONFIG_SRCDIR(Makefile.am)
+ AC_CONFIG_AUX_DIR(unix)
+--- sidplay-libs-2.1.1/libsidutils/configure.ac.orig 2012-02-07 21:02:19.144288211 +0100
++++ sidplay-libs-2.1.1/libsidutils/configure.ac 2012-02-07 21:02:49.452289775 +0100
+@@ -1,5 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
++m4_include([unix/my_macros.m4])
++m4_include([unix/sidplay2.m4])
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
+
+--- sidplay-libs-2.1.1/builders/hardsid-builder/configure.ac.orig 2012-02-07 20:53:45.060261696 +0100
++++ sidplay-libs-2.1.1/builders/hardsid-builder/configure.ac 2012-02-07 20:54:13.956263188 +0100
+@@ -1,5 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
++m4_include([unix/my_macros.m4])
++m4_include([unix/sidplay2.m4])
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
+
+--- sidplay-libs-2.1.1/builders/resid-builder/configure.ac.orig 2012-02-07 20:29:06.764185453 +0100
++++ sidplay-libs-2.1.1/builders/resid-builder/configure.ac 2012-02-07 20:29:36.188186968 +0100
+@@ -1,5 +1,7 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT(Makefile.am)
++m4_include([unix/my_macros.m4])
++m4_include([unix/sidplay2.m4])
+ AC_CONFIG_AUX_DIR(unix)
+ AM_CONFIG_HEADER(unix/config.h)
+