diff --git a/0001-Add-shebang-for-exp-files.patch b/opa-ff-add-shebang-for-exp-files.patch
similarity index 100%
rename from 0001-Add-shebang-for-exp-files.patch
rename to opa-ff-add-shebang-for-exp-files.patch
diff --git a/opa-ff-sigset-was-removed.patch b/opa-ff-sigset-was-removed.patch
new file mode 100644
index 0000000..66f52a9
--- /dev/null
+++ b/opa-ff-sigset-was-removed.patch
@@ -0,0 +1,18 @@
+diff --git Esm/ib/src/ibaccess/vs_thr.c Esm/ib/src/ibaccess/vs_thr.c
+index 82f30ca..e9281f4 100755
+--- Esm/ib/src/ibaccess/vs_thr.c
++++ Esm/ib/src/ibaccess/vs_thr.c
+@@ -51,11 +51,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SFW       03/10/02    Initial functions all passing testcases.
+ * MGR       04/19/02    Changed pthread_kill call to pthread_cancel.
+ ***********************************************************************/
+-//#if defined(LINT)
++#if defined(LINT)
+ #include <pthread.h>
+ #define __signed__ signed
+ #include <bits/sigset.h>
+-//#endif
++#endif
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
diff --git a/opa-ff_fix_suse_build_issue.patch b/opa-ff-suse-build-fixes.patch
similarity index 100%
rename from opa-ff_fix_suse_build_issue.patch
rename to opa-ff-suse-build-fixes.patch
diff --git a/opa-ff.changes b/opa-ff.changes
index fef6dff..dc168e8 100644
--- a/opa-ff.changes
+++ b/opa-ff.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Aug 28 12:01:45 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Updates patches to latest sources:
+  * opa-ff_fix_suse_build_issue.patch replaced by
+    opa-ff-suse-build-fixes.patch
+  * 0001-Add-shebang-for-exp-files.patch replaced by
+    opa-ff-add-shebang-for-exp-files.patch
+- Add opa-ff-sigset-was-removed.patch to build with the latest glibc
+  which does not expose <bits/sigset.h> anymore
+
 -------------------------------------------------------------------
 Fri Jun 23 15:40:51 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/opa-ff.spec b/opa-ff.spec
index 260ef44..3c99eb6 100644
--- a/opa-ff.spec
+++ b/opa-ff.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package opa-ff
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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,17 +27,18 @@ Group:          System/Libraries
 Url:            http://www.intel.com/
 Source:         opa-ff-%{version}.tar.gz
 Source1:        opa-ff.rpmlintrc
-Patch1:         opa-ff_fix_suse_build_issue.patch
-Patch2:         0001-Add-shebang-for-exp-files.patch
+Patch1:         opa-ff-add-shebang-for-exp-files.patch
+Patch2:         opa-ff-suse-build-fixes.patch
+Patch3:         opa-ff-sigset-was-removed.patch
 BuildRequires:  gcc-c++
+BuildRequires:  infiniband-diags-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  rdma-core-devel
-BuildRequires:  librdmacm1
 BuildRequires:  libopenssl-devel
+BuildRequires:  librdmacm1
 BuildRequires:  ncurses-devel
+BuildRequires:  rdma-core-devel
 BuildRequires:  tcl-devel
 BuildRequires:  zlib-devel
-BuildRequires:  infiniband-diags-devel
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 #Currently ONLY builds on x86_64
@@ -77,8 +78,8 @@ This is to be filled out more concisely later.
 %package -n opa-address-resolution-devel
 Summary:        Development files for the Address Resolution manager
 Group:          Development/Libraries/C and C++
-Requires:       opa-basic-tools
 Requires:       opa-address-resolution = %{version}
+Requires:       opa-basic-tools
 
 %description -n opa-address-resolution-devel
 This package contains the include files and libraries
@@ -88,6 +89,7 @@ required to develop programs for the opa-address-resolution package.
 %setup -q -n opa-ff-%{version}
 %patch1
 %patch2
+%patch3
 
 %build
 export RPM_OPT_FLAGS
@@ -134,7 +136,6 @@ fi
 
 %define release_string IntelOPA-Tools-FF.$BUILD_TARGET_OS_ID.$MODULEVERSION
 
-
 #rm -rf $RPM_BUILD_ROOT
 mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_sbindir}
@@ -208,7 +209,6 @@ ln -s libopasadb.so.* %{buildroot}%{_libdir}/libopasadb.so
 cp -t %{buildroot}%{_libdir}/ibacm libdsap.so.*
 ln -s libdsap.so.* %{buildroot}%{_libdir}/ibacm/libdsap.so
 
-
 ln -s /etc/opa/sysconfig/allhosts               %{buildroot}/etc/sysconfig/opa/allhosts
 ln -s /etc/opa/sysconfig/chassis                %{buildroot}/etc/sysconfig/opa/chassis
 ln -s /etc/opa/sysconfig/esm_chassis            %{buildroot}//etc/sysconfig/opa/esm_chassis
@@ -288,7 +288,6 @@ cat %{_builddir}/ff_sbin_file.list %{_builddir}/ff_help_file.list %{_builddir}/f
 #cd /opt/opa/src/mpi_apps >/dev/null 2>&1
 #make -k clean >/dev/null 2>&1 || : # suppress all errors and return codes from the make clean.
 
-
 %post -n opa-address-resolution -p /sbin/ldconfig
 %postun -n opa-address-resolution -p /sbin/ldconfig