diff --git a/0001-clang-Don-t-install-static-libraries.patch b/0001-clang-Don-t-install-static-libraries.patch
new file mode 100644
index 0000000..4bf7d35
--- /dev/null
+++ b/0001-clang-Don-t-install-static-libraries.patch
@@ -0,0 +1,25 @@
+From 856b789b9de0895786ba23681c4337172676e01e Mon Sep 17 00:00:00 2001
+From: Tom Stellard <tstellar@redhat.com>
+Date: Fri, 31 Jan 2020 11:04:57 -0800
+Subject: [PATCH] clang: Don't install static libraries
+
+---
+ clang/cmake/modules/AddClang.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
+index cbd618e..9cf076a 100644
+--- a/clang/cmake/modules/AddClang.cmake
++++ b/clang/cmake/modules/AddClang.cmake
+@@ -97,7 +97,7 @@ macro(add_clang_library name)
+   if(TARGET ${name})
+     target_link_libraries(${name} INTERFACE ${LLVM_COMMON_LIBS})
+ 
+-    if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN)
++    if (ARG_SHARED AND (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ARG_INSTALL_WITH_TOOLCHAIN))
+       set(export_to_clangtargets)
+       if(${name} IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
+           "clang-libraries" IN_LIST LLVM_DISTRIBUTION_COMPONENTS OR
+-- 
+1.8.3.1
+
diff --git a/clang.spec b/clang.spec
index e88f8ca..0993b85 100644
--- a/clang.spec
+++ b/clang.spec
@@ -4,7 +4,7 @@
 %global min_ver 0
 %global patch_ver 0
 %global rc_ver 1
-%global baserelease 0.1
+%global baserelease 0.2
 
 %global clang_tools_binaries \
 	%{_bindir}/clang-apply-replacements \
@@ -89,6 +89,9 @@ Patch4:		0002-gtest-reorg.patch
 Patch11:	0001-ToolChain-Add-lgcc_s-to-the-linker-flags-when-using-.patch
 Patch13:	0001-Make-funwind-tables-the-default-for-all-archs.patch
 
+# Not Upstream
+Patch15:	0001-clang-Don-t-install-static-libraries.patch
+
 BuildRequires:	gcc
 BuildRequires:	gcc-c++
 BuildRequires:	cmake
@@ -231,6 +234,7 @@ pathfix.py -i %{__python3} -pn \
 %patch4 -p1 -b .gtest
 %patch11 -p1 -b .libcxx-fix
 %patch13 -p2 -b .unwind-all
+%patch15 -p2 -b .no-install-static
 
 mv ../%{clang_tools_srcdir} tools/extra
 
@@ -304,6 +308,7 @@ cd _build
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
 	\
 	-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
+	-DBUILD_SHARED_LIBS=OFF \
 	-DCLANG_REPOSITORY_STRING="%{?fedora:Fedora}%{?rhel:Red Hat} %{version}-%{release}"
 
 %ninja_build
@@ -448,6 +453,10 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ninja check-all -C _build || \
 
 %endif
 %changelog
+* Fri Jan 31 2020 Tom Stellard <tstellar@redhat.com> - 10.0.0-0.1.rc1
+- Stop shipping individual component libraries
+- https://fedoraproject.org/wiki/Changes/Stop-Shipping-Individual-Component-Libraries-In-clang-lib-Package
+
 * Fri Jan 31 2020 sguelton@redhat.com - 10.0.0-0.1.rc1
 - 10.0.0 rc1