diff --git a/yaml-cpp.spec b/yaml-cpp.spec
index c312851..3840a88 100644
--- a/yaml-cpp.spec
+++ b/yaml-cpp.spec
@@ -1,16 +1,14 @@
 %global sover 0.6
 
 Name:           yaml-cpp
-Version:        0.6.2
-Release:        3%{?dist}
+Version:        0.6.3
+Release:        1%{?dist}
 Summary:        A YAML parser and emitter for C++
 License:        MIT 
 URL:            https://github.com/jbeder/yaml-cpp
 Source0:        https://github.com/jbeder/yaml-cpp/archive/%{name}-%{version}.tar.gz
 
-Patch0:         yaml-cpp-static.patch
-Patch1:         yaml-cpp-include_dir.patch
-Patch2:         CVE-2017-5950.patch
+Patch0:         CVE-2017-5950.patch
 
 BuildRequires:  cmake gcc gcc-c++
 
@@ -48,7 +46,7 @@ rm -rf build_static && mkdir build_static
 
 pushd build_shared
 %cmake -DYAML_CPP_BUILD_TOOLS=OFF \
-       -DBUILD_SHARED_LIBS=ON \
+       -DYAML_BUILD_SHARED_LIBS=ON \
        -DYAML_CPP_BUILD_TESTS=OFF \
        ../
 %make_build
@@ -56,19 +54,26 @@ popd
 
 pushd build_static
 %cmake -DYAML_CPP_BUILD_TOOLS=OFF \
-       -DBUILD_SHARED_LIBS=OFF \
+       -DYAML_BUILD_SHARED_LIBS=OFF \
        -DYAML_CPP_BUILD_TESTS=OFF \
        ../
 %make_build
 
 
 %install
-pushd build_shared
-%make_install
-popd
 pushd build_static
 %make_install yaml-cpp
+popd
 
+# Move files so they don't get trampled
+mv %{buildroot}%{_libdir}/cmake/%{name} \
+   %{buildroot}%{_libdir}/cmake/%{name}-static
+mv %{buildroot}%{_libdir}/pkgconfig/%{name}.pc \
+   %{buildroot}%{_libdir}/pkgconfig/%{name}-static.pc
+
+
+pushd build_shared
+%make_install
 
 %ldconfig_scriptlets
 
@@ -92,6 +97,9 @@ pushd build_static
 
 
 %changelog
+* Tue Oct 15 2019 Richard Shaw <hobbes1069@gmail.com> - 0.6.3-1
+- Update to 0.6.3.
+
 * Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild