diff --git a/pam_pkcs11-0.6.8-fix-crypto-cflags.patch b/pam_pkcs11-0.6.8-fix-crypto-cflags.patch
new file mode 100644
index 0000000..4d4771d
--- /dev/null
+++ b/pam_pkcs11-0.6.8-fix-crypto-cflags.patch
@@ -0,0 +1,12 @@
+diff -up ./configure.in.orig ./configure.in
+--- ./configure.in.orig	2016-02-08 23:31:17.057761702 +0100
++++ ./configure.in	2016-02-08 23:31:44.917760530 +0100
+@@ -157,7 +157,7 @@ fi
+ AM_CONDITIONAL(HAVE_NSS, test x$with_nss = xyes)
+ if test "$with_nss" = "yes"
+ then
+-    CRYPTO_CFLAGS="${NSS_CFLAGS}-DHAVE_NSS"
++    CRYPTO_CFLAGS="${NSS_CFLAGS} -DHAVE_NSS"
+     CRYPTO_LIBS=${NSS_LIBS}
+ else
+     CRYPTO_CFLAGS=${OPENSSL_CFLAGS}
diff --git a/pam_pkcs11.changes b/pam_pkcs11.changes
index 443c126..53c745c 100644
--- a/pam_pkcs11.changes
+++ b/pam_pkcs11.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Feb  9 19:02:43 UTC 2016 - antoine.belvire@laposte.net
+
+- Fix build for Tumbleweed:
+  * Add pam_pkcs11-0.6.8-fix-crypto-cflags.patch
+  * Rebuild configure with the bootstrap script (add libtool as
+    build dependency)
+
 -------------------------------------------------------------------
 Tue Jul 10 17:24:56 CEST 2012 - sbrabec@suse.cz
 
diff --git a/pam_pkcs11.spec b/pam_pkcs11.spec
index 1d18341..021f274 100644
--- a/pam_pkcs11.spec
+++ b/pam_pkcs11.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package pam_pkcs11
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -27,9 +27,12 @@ Source:         %{name}-%{version}.tar.gz
 Source1:        pam_pkcs11-common-auth-smartcard.pam
 Source2:        baselibs.conf
 Patch1:         %{name}-0.5.3-nss-conf.patch
+# PATCH-FIX-UPSTREAM pam_pkcs11-0.6.8-fix-crypto-cflags.patch -- Fix CFLAGS and build for Tumbleweed
+Patch2:         %{name}-0.6.8-fix-crypto-cflags.patch
 Patch3:         %{name}-0.6.0-nss-autoconf.patch
 BuildRequires:  curl-devel
 BuildRequires:  flex
+BuildRequires:  libtool
 BuildRequires:  libxslt
 BuildRequires:  mozilla-nss-devel
 BuildRequires:  openldap2-devel
@@ -71,6 +74,7 @@ Authors:
 %prep
 %setup -q
 %patch1 -p1
+%patch2
 %patch3 -p1
 cp -a %{S:1} common-auth-smartcard
 mv po/pt_br.po po/pt_BR.po
@@ -78,6 +82,7 @@ sed -i s/pt_br/pt_BR/ configure.in configure
 sed -i s:/lib/:/%{_lib}/:g etc/pam_pkcs11.conf.example.in etc/pkcs11_eventmgr.conf.example
 
 %build
+./bootstrap
 %configure\
 	--docdir=%{_docdir}/%{name}\
 	--with-nss\