diff --git a/libfabric.changes b/libfabric.changes
index 11abae6..b7e4f63 100644
--- a/libfabric.changes
+++ b/libfabric.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jun 30 07:42:15 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Add x86 build without libpsm2
+
 -------------------------------------------------------------------
 Tue May 16 06:43:19 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/libfabric.spec b/libfabric.spec
index ecaae8c..0dde89b 100644
--- a/libfabric.spec
+++ b/libfabric.spec
@@ -35,12 +35,13 @@ BuildRequires:  automake
 BuildRequires:  infinipath-psm-devel
 BuildRequires:  libibverbs-devel
 BuildRequires:  libnl3-devel
+%ifarch x86_64
 BuildRequires:  libpsm2-devel
+%endif
 BuildRequires:  librdmacm-devel
 BuildRequires:  libtool
 BuildRequires:  pkg-config
-#Currently *only* builds on x86_64 as it is dependent on libpsm2
-ExclusiveArch:  x86_64
+ExclusiveArch:  x86_64 %{ix86}
 %define lib_major 1
 
 %description
@@ -74,7 +75,10 @@ autoreconf -fi
 # defaults: with-dlopen and without-valgrind can be over-rode:
 %configure %{?_without_dlopen} %{?_with_valgrind} \
 	--enable-sockets --enable-verbs --enable-usnic --enable-psm \
-        --disable-static  --enable-psm2
+%ifarch x86_64
+    --enable-psm2 \
+%endif
+        --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -225,7 +229,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_mandir}/man7/fi_verbs.7.gz
 %{_mandir}/man7/fi_usnic.7.gz
 %{_mandir}/man7/fi_psm.7.gz
+%ifarch x86_64
 %{_mandir}/man7/fi_psm2.7.gz
+%endif
 %{_mandir}/man3/fi_trywait.3.gz
 %{_mandir}/man7/fi_udp.7.gz