diff --git a/0001-Don-t-set-rpath-when-installing.patch b/0001-Don-t-set-rpath-when-installing.patch
new file mode 100644
index 0000000..d92a387
--- /dev/null
+++ b/0001-Don-t-set-rpath-when-installing.patch
@@ -0,0 +1,24 @@
+From e67ace2ecb42c24e124f1738dc67b22055a22500 Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Thu, 13 Sep 2018 10:10:08 -0700
+Subject: [PATCH] Don't set rpath when installing
+
+---
+ cmake/modules/AddLLVM.cmake | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
+index ce2057f..de309b5 100644
+--- a/cmake/modules/AddLLVM.cmake
++++ b/cmake/modules/AddLLVM.cmake
+@@ -1621,6 +1621,7 @@ function(llvm_codesign name)
+ endfunction()
+ 
+ function(llvm_setup_rpath name)
++  return()
+   if(CMAKE_INSTALL_RPATH)
+     return()
+   endif()
+-- 
+1.8.3.1
+
diff --git a/llvm.spec b/llvm.spec
index f1e9fe7..aaa402a 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -51,7 +51,7 @@
 
 Name:		%{pkg_name}
 Version:	%{maj_ver}.%{min_ver}.%{patch_ver}
-Release:	0.14.rc%{rc_ver}%{?dist}
+Release:	0.15.rc%{rc_ver}%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -67,6 +67,7 @@ Patch12:	0001-unittests-Don-t-install-TestPlugin.so.patch
 # removes the preferences for python2, so we can make sure we always use
 # python3.
 Patch14:	0001-CMake-Don-t-prefer-python2.7.patch
+Patch15:	0001-Don-t-set-rpath-when-installing.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -89,7 +90,6 @@ BuildRequires:  valgrind-devel
 BuildRequires:  libedit-devel
 # We need python3-devel for pathfix.py.
 BuildRequires:	python3-devel
-BuildRequires:	chrpath
 
 Requires:	%{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -277,13 +277,6 @@ cp -R _build/unittests %{buildroot}%{llvm_bindir}/
 # FIXME: Can't figure out how to make the find command succeed.
 find %{buildroot}%{llvm_bindir} -ignore_readdir_race -iname 'cmake*' -exec rm -Rf '{}' ';' || true
 
-# Remove rpath
-chrpath --delete %{buildroot}%{_bindir}/*
-chrpath --delete %{buildroot}%{_libdir}/*.so*
-
-for f in `find %{buildroot}%{llvm_bindir} -executable -type f`; do
-	chrpath --delete $f
-done
 %else
 
 # Add version suffix to binaries
@@ -425,6 +418,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 13 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.15.rc3
+- Disable rpath on install LLVM and related sub-projects
+
 * Wed Sep 12 2018 Tom Stellard <tstellar@redhat.com> - 7.0.0-0.14.rc3
 - Remove rpath from executables and libraries