diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..b912c04
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1,2 @@
+libinfinipath4
+libpsm_infinipath1
diff --git a/infinipath-psm.changes b/infinipath-psm.changes
index d3fdee8..3817103 100644
--- a/infinipath-psm.changes
+++ b/infinipath-psm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov 30 14:42:24 CET 2016 - pth@suse.de
+
+- Add baselibs.conf as 32 bit libs are needed (bsc#1004947).
+
 -------------------------------------------------------------------
 Mon Apr 25 07:41:38 UTC 2016 - p.drouand@gmail.com
 
diff --git a/infinipath-psm.spec b/infinipath-psm.spec
index d5e5fd2..cea6916 100644
--- a/infinipath-psm.spec
+++ b/infinipath-psm.spec
@@ -26,6 +26,7 @@ License:        BSD-2-Clause or GPL-2.0
 Group:          Productivity/Networking/System
 Url:            http://www.qlogic.com/
 Source0:        http://downloads.openfabrics.org/downloads/infinipath-psm/%{name}-%{version}%{my_release}_open.tar.gz
+Source1:        baselibs.conf
 # PATCH-FIX-UPSTREAM infinipath-psm-cflags.patch pth@suse.de
 Patch0:         infinipath-psm-cflags.patch
 # PATCH-FIX-UPSTREAM infinipath-psm-no_werror.patch pth@suse.de
@@ -51,8 +52,8 @@ interfaces in parallel environments.
 %package        devel
 Summary:        Development files for QLogic PSM
 Group:          Development/Libraries/C and C++
-Requires:       %{lname} = %{version}
 Requires:       %{lnamepsm} = %{version}
+Requires:       %{lname} = %{version}
 Requires:       libuuid-devel
 Conflicts:      infinipath-devel
 
@@ -91,7 +92,6 @@ interfaces in parallel environments.
 
 %build
 export RPM_OPT_FLAGS="%{optflags} -Wno-unused-but-set-variable"
-#make USE_PSM_UUID=1 libdir=%{_libdir} %{?_smp_mflags} 
 make libdir=%{_libdir} %{?_smp_mflags} 
 
 %install