diff --git a/0001-build-call-AC_BUILD_AUX_DIR-before-anything-else.patch b/0001-build-call-AC_BUILD_AUX_DIR-before-anything-else.patch
new file mode 100644
index 0000000..49a5d68
--- /dev/null
+++ b/0001-build-call-AC_BUILD_AUX_DIR-before-anything-else.patch
@@ -0,0 +1,72 @@
+From d88892b43dc8183a06cd811690fa8af26ad018c9 Mon Sep 17 00:00:00 2001
+From: Jan Engelhardt <jengelh@inai.de>
+Date: Sat, 11 Oct 2014 15:27:45 +0200
+Subject: [PATCH] build: call AC_BUILD_AUX_DIR before anything else
+X-Upstream: sent 2014-10-11 15:36
+To: sssd-devel@lists.fedorahosted.org
+Cc: Sumit Bose <sbose@redhat.com>,
+    Stefano Lattarini <stefano.lattarini@gmail.com>
+
+sssd's configure.ac (abridged) contains these lines:
+
+	AC_INIT([sssd], ...)
+	m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+		[AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])
+	AC_CONFIG_AUX_DIR([build])
+
+When turned into configure, this will be emitted:
+
+	ac_aux_dir=
+	for ac_dir in build "$srcdir"/build; do
+	  if test -f "$ac_dir/install-sh"; then
+	    ac_aux_dir=$ac_dir
+	    ac_install_sh="$ac_aux_dir/install-sh -c"
+	    break
+
+However, with automake commit v1.14.1-36-g7bc5927, this will be emitted
+instead:
+
+	ac_aux_dir=
+	for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+	  if test -f "$ac_dir/install-sh"; then
+	    ac_aux_dir=$ac_dir
+	    ac_install_sh="$ac_aux_dir/install-sh -c"
+	    break
+
+As configure no longer looks into build/ for install-sh, running
+./configure fails:
+
+	configure: error: cannot find install-sh, install.sh,
+	or shtool in "." "./.." "./../.."
+
+I think the error is that someone placed AC_BUILD_AUX_DIR
+too late. Move it upwards.
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 660ea8d..e6745cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4,6 +4,8 @@ m4_include([version.m4])
+ AC_INIT([sssd],
+         VERSION_NUMBER,
+         [sssd-devel@lists.fedorahosted.org])
++AC_CONFIG_SRCDIR([BUILD.txt])
++AC_CONFIG_AUX_DIR([build])
+ 
+ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+     [AC_USE_SYSTEM_EXTENSIONS],
+@@ -11,8 +13,6 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
+ 
+ CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ 
+-AC_CONFIG_SRCDIR([BUILD.txt])
+-AC_CONFIG_AUX_DIR([build])
+ 
+ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax])
+ AM_PROG_CC_C_O
+-- 
+2.0.0
+
diff --git a/sssd.changes b/sssd.changes
index 0cc8d57..3a487d2 100644
--- a/sssd.changes
+++ b/sssd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct 11 13:36:48 UTC 2014 - jengelh@inai.de
+
+- Add 0001-build-call-AC_BUILD_AUX_DIR-before-anything-else.patch
+  to workaround bad autoconf invocation
+
 -------------------------------------------------------------------
 Sat Oct 11 00:16:15 UTC 2014 - crrodriguez@opensuse.org
 
diff --git a/sssd.spec b/sssd.spec
index a4085d5..33d36e4 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -32,6 +32,7 @@ Source4:        sssd.service
 Source5:        %name.keyring
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch1:         0001-build-detect-endianness-at-configure-time.patch
+Patch2:         0001-build-call-AC_BUILD_AUX_DIR-before-anything-else.patch
 
 %define servicename	sssd
 %define sssdstatedir	%_localstatedir/lib/sss
@@ -329,7 +330,7 @@ Security Services Daemon (sssd).
 
 %prep
 %setup -q
-%patch -P 1 -p1
+%patch -P 1 -P 2 -p1
 
 %build
 %if 0%{?suse_version} < 1210