diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 313671c..f056743 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2004-2012 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2013 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -12,7 +12,7 @@
 
 Name: gfs2-utils
 Version: 3.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Kernel
 Summary: Utilities for managing the global file system (GFS2)
@@ -28,6 +28,7 @@ BuildRequires: gettext-devel
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: libblkid-devel
+BuildRequires: check-devel
 URL: https://fedorahosted.org/cluster/wiki/HomePage
 
 # The source for this package was pulled from the upstream git tree.
@@ -48,9 +49,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %configure
 make %{_smp_mflags}
 
+%check
+make check
+
 %install
 rm -rf %{buildroot}
 make -C gfs2 install DESTDIR=%{buildroot}
+# Don't ship gfs2_{trace,lockcapture} in this package
+rm -f %{buildroot}/sbin/gfs2_trace
+rm -f %{buildroot}/sbin/gfs2_lockcapture
+rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8
+rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8
 
 %clean
 rm -rf %{buildroot}
@@ -62,7 +71,7 @@ file systems.
 
 %files -n gfs2-utils
 %defattr(-,root,root,-)
-%doc doc/COPYING.* doc/COPYRIGHT doc/README.licence doc/*.txt
+%doc doc/COPYING.* doc/COPYRIGHT doc/README.* doc/*.txt
 /sbin/*
 %{_sbindir}/gfs2_*
 %{_sbindir}/tunegfs2
@@ -70,6 +79,12 @@ file systems.
 %{_mandir}/man5/*
 
 %changelog
+* Mon Jul 29 2013 Andrew Price <anprice@redhat.com> - 3.1.6-2
+- Don't install gfs2_lockcapture and gfs2_trace
+  Resolves: rhbz#987019
+- Run test suite after build (requires check-devel build req)
+- Install both of the READMEs into doc/
+
 * Wed Jul 24 2013 Andrew Price <anprice@redhat.com> - 3.1.6-1
 - New upstream release
 - Drop 'file' requirement - mkfs.gfs2 now uses libblkid instead