diff --git a/gnome-common-am112.patch b/gnome-common-am112.patch
new file mode 100644
index 0000000..0cb9195
--- /dev/null
+++ b/gnome-common-am112.patch
@@ -0,0 +1,43 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2012-05-30 15:52:46.147646604 +0200
+
+First, using "1.4*" is prone to match a future version of
+automake-1.40. Don't do things like that, it has already bitten
+people with the FreeBSD 10 release that matched freebsd1* (in
+config.guess).
+
+Second, upstream should think of something so that gnome-autogen.sh
+does /not/ need to be modified for every new automake release.
+
+---
+ macros2/gnome-autogen.sh |   17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+Index: gnome-common-3.4.0.1/macros2/gnome-autogen.sh
+===================================================================
+--- gnome-common-3.4.0.1.orig/macros2/gnome-autogen.sh
++++ gnome-common-3.4.0.1/macros2/gnome-autogen.sh
+@@ -324,14 +324,15 @@ version_check autoconf AUTOCONF 'autocon
+ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
+ 
+ case $REQUIRED_AUTOMAKE_VERSION in
+-    1.4*) automake_progs="automake-1.4" ;;
+-    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
+-    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+-    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+-    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+-    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
+-    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
+-    1.11*) automake_progs="automake-1.11" ;;
++    1.4|1.4[[:alpha:]]|1.4.*) automake_progs="automake-1.4" ;;
++    1.5|1.5[[:alpha:]]|1.5.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6|1.6[[:alpha:]]|1.6.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7|1.7[[:alpha:]]|1.7.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8|1.8[[:alpha:]]|1.8.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9|1.9[[:alpha:]]|1.9.*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10|1.10[[:alpha:]]|1.10.*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11|1.11[[:alpha::]|1.11.*) automake_progs="automake-1.12 automake-1.11" ;;
++    1.12|1.12[[:alpha::]|1.12.*) automake_progs="automake-1.12 automake-1.11" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
diff --git a/gnome-common.changes b/gnome-common.changes
index e06a4ea..1db3c4c 100644
--- a/gnome-common.changes
+++ b/gnome-common.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 30 13:53:12 UTC 2012 - jengelh@inai.de
+
+- Parallel build with %_smp_mflags
+- Add gnome-common-am112.patch: Add support for automake 1.12.
+
 -------------------------------------------------------------------
 Mon Mar 26 15:20:19 UTC 2012 - vuntz@opensuse.org
 
diff --git a/gnome-common.spec b/gnome-common.spec
index 830a924..015ca1f 100644
--- a/gnome-common.spec
+++ b/gnome-common.spec
@@ -35,6 +35,8 @@ Group:          System/GUI/GNOME
 Version:        3.4.0.1
 Release:        0
 Source:         http://download.gnome.org/sources/gnome-common/3.4/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM gnome-common-am112.patch bgo#675093 jengelh@inai.de -- Add support for automake 1.12.
+Patch1:         gnome-common-am112.patch
 Url:            http://www.gnome.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
@@ -44,10 +46,11 @@ Gnome-common includes files used by to build GNOME and GNOME applications.
 
 %prep
 %setup -q
+%patch -P 1 -p1
 
 %build
 %configure
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 %makeinstall