diff --git a/.gitignore b/.gitignore
index e79c547..0059afc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/openmpi-4.0.1.tar.bz2
+SOURCES/openmpi-4.0.2.tar.bz2
diff --git a/.openmpi.metadata b/.openmpi.metadata
index 177a7ff..4f22582 100644
--- a/.openmpi.metadata
+++ b/.openmpi.metadata
@@ -1 +1 @@
-35bf7c9162b08ecdc4876af573786cd290015631 SOURCES/openmpi-4.0.1.tar.bz2
+32ce3761288575fb8e4f6296c9105c3a25cf3235 SOURCES/openmpi-4.0.2.tar.bz2
diff --git a/SPECS/openmpi.spec b/SPECS/openmpi.spec
index 4c5a5d4..fc475b1 100644
--- a/SPECS/openmpi.spec
+++ b/SPECS/openmpi.spec
@@ -21,7 +21,7 @@
 %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 
 Name:			openmpi%{?_cc_name_suffix}
-Version:		4.0.1
+Version:		4.0.2
 Release:		1%{?dist}
 Summary:		Open Message Passing Interface
 Group:			Development/Libraries
@@ -38,8 +38,11 @@ BuildRequires:		gcc-gfortran, gcc-c++
 %ifnarch s390 s390x
 BuildRequires:		valgrind-devel
 %endif
+%ifnarch s390 s390x i686
+BuildRequires:		ucx-devel
+%endif
 %ifnarch s390 s390x %{arm}
-BuildRequires:		libibverbs-devel >= 1.1.3, opensm-devel >= 3.3.21
+BuildRequires:		libibverbs-devel >= 1.1.3, opensm-devel >= 3.3.22
 BuildRequires:		librdmacm-devel rdma-core-devel
 %endif
 # Doesn't compile:
@@ -151,6 +154,10 @@ OpenMPI support for Python 3.
 	--with-valgrind \
 	--enable-memchecker \
 %endif
+%ifnarch s390 s390x i686
+	--with-ucx \
+	--with-ucx-libdir=%{_libdir} \
+%endif
 	--with-hwloc=external \
 	--with-pmix=external \
 	--with-libevent=external \
@@ -228,6 +235,10 @@ make check
 %{_libdir}/%{name}/bin/mpi[er]*
 %{_libdir}/%{name}/bin/ompi*
 %{_libdir}/%{name}/bin/orte[-dr_]*
+%ifnarch s390 s390x i686
+%{_libdir}/%{name}/bin/osh*
+%{_libdir}/%{name}/bin/shmem*
+%endif
 %{_libdir}/%{name}/lib/*.so.*
 %{_mandir}/%{namearch}/man1/*
 %{_mandir}/%{namearch}/man7/*
@@ -276,6 +287,18 @@ make check
 
 
 %changelog
+* Wed Oct 16 2019 Jarod Wilson <jarod@redhat.com> - 4.0.2-1
+- Update to upstream v4.0.2 release
+- Resolves: rhbz#1725631
+
+* Thu Aug 01 2019 Jarod Wilson <jarod@redhat.com> - 4.0.1-3
+- Actually enable UCX support
+- Resolves: rhbz#1642942
+
+* Wed Jun 19 2019 Jarod Wilson <jarod@redhat.com> - 4.0.1-2
+- Bump and rebuild for newer opensm
+- Resolves: rhbz#1717289
+
 * Mon Apr 29 2019 Jarod Wilson <jarod@redhat.com> - 4.0.1-1
 - Update to upstream v4.0.1 release
 - Resolves: rhbz#1660623