diff --git a/apitrace.spec b/apitrace.spec
index 7fede05..8c7f901 100644
--- a/apitrace.spec
+++ b/apitrace.spec
@@ -3,7 +3,7 @@
 
 Name:           apitrace
 Version:        7.1
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tools for tracing OpenGL
 
 License:        MIT
@@ -22,6 +22,7 @@ BuildRequires:  qt5-qtbase-devel
 BuildRequires:  qt5-qtwebkit-devel
 BuildRequires:  python2-devel
 BuildRequires:  libpng-devel
+BuildRequires:  libdwarf-devel
 BuildRequires:  snappy-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  libappstream-glib
@@ -65,7 +66,7 @@ This package contains qapitrace, the Graphical frontend for apitrace.
 %autosetup -p1
 
 # Remove bundled libraries, except khronos headers and libbacktrace
-rm -rf `ls -1 thirdparty | grep -Ev "(khronos|md5|libbacktrace)"`
+rm -rf `ls -1d thirdparty/* | grep -Ev "(khronos|md5|libbacktrace)"`
 
 # Fix shebangs
 find scripts -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python2}|'
@@ -75,7 +76,7 @@ chmod -x retrace/glretrace_main.cpp
 
 
 %build
-%cmake .
+%cmake -DENABLE_STATIC_SNAPPY=OFF .
 %make_build
 
 
@@ -125,6 +126,10 @@ make check
 
 
 %changelog
+* Mon Oct 30 2017 Sandro Mani <manisandro@gmail.com> - 7.1-8
+- Correctly remove thirdparty bundled libraries (#1507659)
+- Add BR: libdwarf-devel to enable backtrace support
+
 * Mon Aug 07 2017 Sandro Mani <manisandro@gmail.com> - 7.1-7
 - Don't add -nn to the moc options