diff --git a/xfsprogs.spec b/xfsprogs.spec
index 88aec84..012f76f 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	3.0.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -45,6 +45,19 @@ You should install xfsprogs-devel if you want to develop XFS
 filesystem-specific programs,  If you install xfsprogs-devel, you'll
 also want to install xfsprogs.
 
+%package qa-devel
+Summary: XFS QA filesystem-specific static libraries and headers
+Group: Development/Libraries
+Requires: xfsprogs = %{version}-%{release}
+Requires: xfsprogs-devel = %{version}-%{release}
+
+%description qa-devel
+xfsprogs-qa-devel contains headers and libraries needed to build
+the xfstests QA suite.
+
+You should install xfsprogs-qa-devel only if you are interested
+in building or running the xfstests QA suite.
+
 %prep
 %setup -q
 
@@ -62,7 +75,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DIST_ROOT=$RPM_BUILD_ROOT install install-dev
+make DIST_ROOT=$RPM_BUILD_ROOT install install-dev install-qa
 
 # nuke .la files, etc
 rm -f $RPM_BUILD_ROOT/{%{_lib}/*.{la,a,so},%{_libdir}/*.la}
@@ -106,11 +119,74 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %{_mandir}/man3/*
-%{_includedir}/xfs
+%dir %{_includedir}/xfs
+%{_includedir}/xfs/handle.h
+%{_includedir}/xfs/jdm.h
+%{_includedir}/xfs/linux.h
+%{_includedir}/xfs/platform_defs-%{_arch}.h
+%{_includedir}/xfs/platform_defs.h
+%{_includedir}/xfs/xfs.h
+%{_includedir}/xfs/xfs_fs.h
+%{_includedir}/xfs/xqm.h
 %{_libdir}/*.a
 %{_libdir}/*.so
 
+%files qa-devel
+%defattr(-,root,root)
+%{_includedir}/xfs/bitops.h
+%{_includedir}/xfs/cache.h
+%{_includedir}/xfs/kmem.h
+%{_includedir}/xfs/libxfs.h
+%{_includedir}/xfs/libxlog.h
+%{_includedir}/xfs/list.h
+%{_includedir}/xfs/parent.h
+%{_includedir}/xfs/swab.h
+%{_includedir}/xfs/xfs_ag.h
+%{_includedir}/xfs/xfs_alloc.h
+%{_includedir}/xfs/xfs_alloc_btree.h
+%{_includedir}/xfs/xfs_arch.h
+%{_includedir}/xfs/xfs_attr_leaf.h
+%{_includedir}/xfs/xfs_attr_sf.h
+%{_includedir}/xfs/xfs_bit.h
+%{_includedir}/xfs/xfs_bmap.h
+%{_includedir}/xfs/xfs_bmap_btree.h
+%{_includedir}/xfs/xfs_btree.h
+%{_includedir}/xfs/xfs_btree_trace.h
+%{_includedir}/xfs/xfs_buf_item.h
+%{_includedir}/xfs/xfs_da_btree.h
+%{_includedir}/xfs/xfs_dfrag.h
+%{_includedir}/xfs/xfs_dinode.h
+%{_includedir}/xfs/xfs_dir2.h
+%{_includedir}/xfs/xfs_dir2_block.h
+%{_includedir}/xfs/xfs_dir2_data.h
+%{_includedir}/xfs/xfs_dir2_leaf.h
+%{_includedir}/xfs/xfs_dir2_node.h
+%{_includedir}/xfs/xfs_dir2_sf.h
+%{_includedir}/xfs/xfs_dir_leaf.h
+%{_includedir}/xfs/xfs_dir_sf.h
+%{_includedir}/xfs/xfs_extfree_item.h
+%{_includedir}/xfs/xfs_ialloc.h
+%{_includedir}/xfs/xfs_ialloc_btree.h
+%{_includedir}/xfs/xfs_imap.h
+%{_includedir}/xfs/xfs_inode.h
+%{_includedir}/xfs/xfs_inode_item.h
+%{_includedir}/xfs/xfs_inum.h
+%{_includedir}/xfs/xfs_log.h
+%{_includedir}/xfs/xfs_log_priv.h
+%{_includedir}/xfs/xfs_log_recover.h
+%{_includedir}/xfs/xfs_metadump.h
+%{_includedir}/xfs/xfs_mount.h
+%{_includedir}/xfs/xfs_quota.h
+%{_includedir}/xfs/xfs_rtalloc.h
+%{_includedir}/xfs/xfs_sb.h
+%{_includedir}/xfs/xfs_trans.h
+%{_includedir}/xfs/xfs_trans_space.h
+%{_includedir}/xfs/xfs_types.h
+
 %changelog
+* Sat Apr 18 2009 Eric Sandeen <sandeen@redhat.com> 3.0.0-3
+- Create new xfsprogs-qa-devel subpackage
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild