diff --git a/SOURCES/remove-packager.patch b/SOURCES/remove-packager.patch
new file mode 100644
index 0000000..a40743b
--- /dev/null
+++ b/SOURCES/remove-packager.patch
@@ -0,0 +1,13 @@
+diff -rup opae-1.4.1-1.orig/tools/CMakeLists.txt opae-1.4.1-1/tools/CMakeLists.txt
+--- opae-1.4.1-1.orig/tools/CMakeLists.txt	2020-07-14 14:03:22.165674256 -0400
++++ opae-1.4.1-1/tools/CMakeLists.txt	2020-07-14 14:04:05.942469002 -0400
+@@ -36,7 +36,7 @@ opae_add_subdirectory(fpgad)
+ 
+ # extra
+ opae_add_subdirectory(extra/userclk)
+-opae_add_subdirectory(extra/packager)
++#opae_add_subdirectory(extra/packager)
+ opae_add_subdirectory(extra/c++utils)
+ opae_add_subdirectory(extra/fpgadiag)
+ opae_add_subdirectory(extra/mmlink)
+Only in opae-1.4.1-1/tools: CMakeLists.txt~
diff --git a/SOURCES/remove-samples.patch b/SOURCES/remove-samples.patch
new file mode 100644
index 0000000..7575492
--- /dev/null
+++ b/SOURCES/remove-samples.patch
@@ -0,0 +1,35 @@
+--- opae-1.4.1-1.orig/CMakeLists.txt	2020-07-14 14:03:21.824668065 -0400
++++ opae-1.4.1-1/CMakeLists.txt	2020-07-15 16:27:11.589483695 -0400
+@@ -61,7 +61,7 @@ endif()
+ opae_add_subdirectory(opae-libs)
+ opae_add_subdirectory(platforms)
+ opae_add_subdirectory(tools)
+-opae_add_subdirectory(samples)
++# opae_add_subdirectory(samples)
+ opae_add_subdirectory(python)
+ 
+ if(OPAE_BUILD_TESTS)
+diff -rup opae-1.4.1-1.orig/opae-libs/libopaecxx/CMakeLists.txt opae-1.4.1-1/opae-libs/libopaecxx/CMakeLists.txt
+--- opae-1.4.1-1.orig/opae-libs/libopaecxx/CMakeLists.txt	2020-07-14 14:03:21.737666486 -0400
++++ opae-1.4.1-1/opae-libs/libopaecxx/CMakeLists.txt	2020-07-15 16:35:22.468312313 -0400
+@@ -49,11 +49,11 @@ opae_add_shared_library(TARGET opae-cxx-
+     COMPONENT opaecxxcorelib
+ )
+ 
+-opae_add_executable(TARGET hello_cxxcore
+-    SOURCE samples/hello_fpga-1.cpp
+-    LIBS
+-        opae-c
+-        opae-cxx-core
+-        ${libjson-c_LIBRARIES}
+-    COMPONENT samples
+-)
++#opae_add_executable(TARGET hello_cxxcore
++#    SOURCE samples/hello_fpga-1.cpp
++#    LIBS
++#        opae-c
++#        opae-cxx-core
++#        ${libjson-c_LIBRARIES}
++#    COMPONENT samples
++#)
+Only in opae-1.4.1-1/opae-libs/libopaecxx: CMakeLists.txt~
diff --git a/SPECS/opae.spec b/SPECS/opae.spec
index 107a5e8..150efce 100644
--- a/SPECS/opae.spec
+++ b/SPECS/opae.spec
@@ -1,7 +1,7 @@
 Summary:        Open Programmable Acceleration Engine (OPAE) SDK
 Name:           opae
 Version:        1.4.1
-Release:        11%{?dist}
+Release:        14%{?dist}
 License:        BSD and MIT
 ExclusiveArch:  x86_64
 URL:            https://github.com/OPAE/%{name}-sdk
@@ -12,6 +12,8 @@ Patch03:        0001-Reinclude-fpgaport-in-tools.patch
 Patch04:        0002-Add-support-for-public-dfl-driver-to-fpgaport.patch
 Patch05:        0001-Import-fpgad-from-opae-legacy.patch
 Patch06:        0001-Fix-possible-buffer-overflow.patch
+Patch07:        remove-packager.patch
+Patch08:        remove-samples.patch
 
 BuildRequires:  gcc, gcc-c++
 BuildRequires:  cmake, make
@@ -44,7 +46,7 @@ Summary:    OPAE headers, sample source, and documentation
 Requires:   libuuid-devel, %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-OPAE headers, tools, sample source, and documentation
+OPAE headers, sample source, and documentation
 
 %prep
 %setup -q -n %{name}-%{version}-1
@@ -54,6 +56,8 @@ OPAE headers, tools, sample source, and documentation
 %patch04 -p1
 %patch05 -p1
 %patch06 -p1
+%patch07 -p1
+%patch08 -p1
 
 # Remove hidden .clang-format
 rm opae-libs/tests/xfpga/.clang-format
@@ -112,11 +116,26 @@ cp samples/hello_fpga/hello_fpga.c %{buildroot}%{_usr}/src/opae/samples/hello_fp
 %{_libdir}/libopae-c-ase.so.1
 %{_libdir}/libopae-cxx-core.so.%{version}
 %{_libdir}/libopae-cxx-core.so.1
+%{_libdir}/opae/libboard_rc.so
+%{_libdir}/opae/libboard_vc.so
+%{_libdir}/opae/libfpgad-vc.so
+%{_libdir}/opae/libmodbmc.so
+%{_libdir}/opae/libxfpga.so
+%{_libdir}/opae/libfpgad-xfpga.so
+%config(noreplace) %{_sysconfdir}/opae/fpgad.cfg*
+%config(noreplace) %{_sysconfdir}/sysconfig/fpgad.conf*
+%{_bindir}/fpgaconf
+%{_bindir}/fpgad
+%{_bindir}/fpgainfo
+%{_bindir}/fpgaport
+%{_bindir}/mmlink
+%{_bindir}/userclk
+%{_unitdir}/fpgad.service
 
-%post devel            
+%post
 %systemd_post fpgad.service            
 
-%preun devel            
+%preun
 %systemd_preun fpgad.service
 
 %files devel
@@ -126,37 +145,27 @@ cp samples/hello_fpga/hello_fpga.c %{buildroot}%{_usr}/src/opae/samples/hello_fp
 %dir %{_usr}/src/opae/cmake/
 %dir %{_usr}/src/opae/opae-libs/cmake/modules/
 %dir %{_usr}/src/opae/samples
-%config(noreplace) %{_sysconfdir}/opae/fpgad.cfg*            
-%config(noreplace) %{_sysconfdir}/sysconfig/fpgad.conf*
-%{_bindir}/fpgaconf
-%{_bindir}/fpgad
-%{_bindir}/fpgainfo
-%{_bindir}/fpgaport
-%{_bindir}/mmlink
-%{_bindir}/userclk
-%{_bindir}/hello_fpga
-%{_bindir}/hello_cxxcore
-%{_bindir}/afu_json_mgr
-%{_bindir}/packager
 %{_includedir}/opae/*
 %{_libdir}/libbitstream.so
 %{_libdir}/libfpgad-api.so
 %{_libdir}/libopae-c.so
 %{_libdir}/libopae-c-ase.so
 %{_libdir}/libopae-cxx-core.so
-%{_libdir}/opae/libboard_rc.so
-%{_libdir}/opae/libboard_vc.so
-%{_libdir}/opae/libfpgad-vc.so
-%{_libdir}/opae/libfpgad-xfpga.so
-%{_libdir}/opae/libmodbmc.so
-%{_libdir}/opae/libxfpga.so
 %{_usr}/share/opae/*
 %{_usr}/src/opae/samples/hello_fpga/hello_fpga.c
 %{_usr}/src/opae/cmake/*
 %{_usr}/src/opae/opae-libs/cmake/modules/*
-%{_unitdir}/fpgad.service
 
 %changelog
+* Wed Jul 15 2020 Tom Rix <trix@redhat.com> - 1.4.1-14
+- Remove built samples
+
+* Tue Jul 14 2020 Tom Rix <trix@redhat.com> - 1.4.1-13
+- Remove packager from devel rpm
+
+* Mon Jul 6 2020 Tom Rix <trix@redhat.com> - 1.4.1-12
+- Move diagnostic tools from devel to main rpm
+
 * Tue Jun 2 2020 Tom Rix <trix@redhat.com> - 1.4.1-11
 - Changelog date