diff --git a/6668.patch b/6668.patch
new file mode 100644
index 0000000..0d6fcbc
--- /dev/null
+++ b/6668.patch
@@ -0,0 +1,34 @@
+From c6ba949f3a0618e26ce2ef53b052b3d38cbbd0d8 Mon Sep 17 00:00:00 2001
+From: Nathan Hjelm <hjelmn@me.com>
+Date: Wed, 15 May 2019 12:24:22 -0600
+Subject: [PATCH] btl/uct: check for support before disabling UCX memory hooks
+
+Signed-off-by: Nathan Hjelm <hjelmn@me.com>
+---
+ opal/mca/btl/uct/btl_uct_component.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/opal/mca/btl/uct/btl_uct_component.c b/opal/mca/btl/uct/btl_uct_component.c
+index 971b31a1d85..830c262325d 100644
+--- a/opal/mca/btl/uct/btl_uct_component.c
++++ b/opal/mca/btl/uct/btl_uct_component.c
+@@ -17,6 +17,7 @@
+  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
+  * Copyright (c) 2018      Triad National Security, LLC. All rights
+  *                         reserved.
++ * Copyright (c) 2019      Google, LLC. All rights reserved.
+  * $COPYRIGHT$
+  *
+  * Additional copyrights may follow
+@@ -129,7 +130,10 @@ static int mca_btl_uct_component_open(void)
+         mca_btl_uct_component.num_contexts_per_module = MCA_BTL_UCT_MAX_WORKERS;
+     }
+ 
+-    if (mca_btl_uct_component.disable_ucx_memory_hooks) {
++    if (mca_btl_uct_component.disable_ucx_memory_hooks &&
++        ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
++        ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) &
++         opal_mem_hooks_support_level()))) {
+         ucm_set_external_event(UCM_EVENT_VM_UNMAPPED);
+         opal_mem_hooks_register_release(mca_btl_uct_mem_release_cb, NULL);
+     }
diff --git a/openmpi.spec b/openmpi.spec
index 3541dd7..6ba71f1 100644
--- a/openmpi.spec
+++ b/openmpi.spec
@@ -21,7 +21,7 @@
 
 Name:			openmpi%{?_cc_name_suffix}
 Version:		4.0.1
-Release:		2%{?dist}
+Release:		3%{?dist}
 Summary:		Open Message Passing Interface
 License:		BSD and MIT and Romio
 URL:			http://www.open-mpi.org/
@@ -32,6 +32,8 @@ Source1:		openmpi.module.in
 Source2:		openmpi.pth.py2
 Source3:		openmpi.pth.py3
 Source4:		macros.openmpi
+# Fix for UCX usage with BTL/UCT
+Patch0:                 https://patch-diff.githubusercontent.com/raw/open-mpi/ompi/pull/6668.patch
 
 BuildRequires:		gcc-c++
 BuildRequires:		gcc-gfortran
@@ -156,7 +158,7 @@ OpenMPI support for Python 3.
 
 
 %prep
-%setup -q -n openmpi-%{version}
+%autosetup -p1 -n openmpi-%{version}
 
 %build
 ./configure --prefix=%{_libdir}/%{name} \
@@ -337,6 +339,9 @@ make check
 
 
 %changelog
+* Wed May 15 2019 Orion Poplawski <orion@nwra.com> - 4.0.1-3
+- Add upstream patch to fix issue with UCX usage in BTL/UCT
+
 * Tue May  7 2019 Orion Poplawski <orion@nwra.com> - 4.0.1-2
 - Add a guard for python3 version (#1705296)
 - Add requires on python(abi) to python packages