diff --git a/automake-1.12.patch b/automake-1.12.patch
new file mode 100644
index 0000000..110d947
--- /dev/null
+++ b/automake-1.12.patch
@@ -0,0 +1,13 @@
+Index: libcaca-0.99.beta18/bootstrap
+===================================================================
+--- libcaca-0.99.beta18.orig/bootstrap
++++ libcaca-0.99.beta18/bootstrap
+@@ -36,7 +36,7 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL
+ 
+ # Check for automake
+ amvers="no"
+-for v in 11 10 9 8 7 6 5; do
++for v in 12 11 10 9 8 7 6 5; do
+   if automake-1.${v} --version >/dev/null 2>&1; then
+     amvers="-1.${v}"
+     break
diff --git a/libcaca.changes b/libcaca.changes
index 819ab1f..ab46000 100644
--- a/libcaca.changes
+++ b/libcaca.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue May 29 14:00:53 UTC 2012 - puzel@suse.com
+
+- fix build with automake-12.1 
+
+-------------------------------------------------------------------
+Tue May 29 10:33:39 UTC 2012 - jengelh@inai.de
+
+- Use autoreconf instead of ./bootstrap since (a) that works,
+  (b) avoids the inflexible handcrafted automake version check
+
 -------------------------------------------------------------------
 Mon May 14 09:29:06 UTC 2012 - coolo@suse.com
 
diff --git a/libcaca.spec b/libcaca.spec
index adf367a..c631a1f 100644
--- a/libcaca.spec
+++ b/libcaca.spec
@@ -52,6 +52,7 @@ Patch4:         libcaca-ruby_am_cflags.patch
 Patch5:         libcaca-ruby_vendor_install.patch
 Patch7:         libcaca-0.99.beta16-missing-GLU.patch
 Patch9:         caca-no-build-date.patch
+Patch10:        automake-1.12.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define rb_vendorarch %{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}
 %define rb_vendorlib %{_libdir}/ruby/vendor_ruby/%{rb_ver}
@@ -181,15 +182,12 @@ chmod 0644 %{S:0}
 %patch7
 %patch9
 %patch1
+%patch10 -p1
 
 %build
-find ./ -name Makefile.in -delete
-rm configure
-#export  LIBTOOL=/usr/bin/libtool
+autoreconf -fi
 export CFLAGS="$CFLAGS %{optflags} -I../caca/"
 export CXXFLAGS="$CXXFLAGS %{optflags}"
-./bootstrap
-#autoreconf -fiv
 %configure --with-pic \
     --program-prefix="%{?_program_prefix}" \
     --enable-slang \
@@ -209,7 +207,7 @@ export CXXFLAGS="$CXXFLAGS %{optflags}"
 %else
     --enable-java=no
 %endif
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 %makeinstall