diff --git a/tpm-tools.spec b/tpm-tools.spec
index 0b55fa2..dbc6058 100644
--- a/tpm-tools.spec
+++ b/tpm-tools.spec
@@ -1,7 +1,6 @@
-
 %define name            tpm-tools
 %define version         1.3.1
-%define release         9
+%define release         10
 
 Name:             %{name}
 Summary:          Management tools for the TPM hardware
@@ -21,14 +20,26 @@ Group's TPM hardware. TPM hardware can create, store and use RSA keys
 securely (without ever being exposed in memory), verify a platform's
 software state using cryptographic hashes and more.
 
+%package        pkcs11
+Summary:        Management tools using PKCS#11 for the TPM hardware
+Group:          Applications/System
+# opencryptoki is dlopen'd, the Requires won't get picked up automatically
+Requires:       opencryptoki-libs%{?_isa}
+
+%description    pkcs11
+tpm-tools-pkcs11 is a group of tools that use the TPM PKCS#11 token. All data
+contained in the PKCS#11 data store is protected by the TPM (keys,
+certificates, etc.). You can import keys and certificates, list out the
+objects in the data store, and protect data.
+
 %package        devel
 Summary:        Files to use the library routines supplied with tpm-tools
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release} 
 
 %description    devel
-%{name}-devel is a package that contains the libraries and headers
-necessary for developing tpm-tools applications.
+tpm-tools-devel is a package that contains the libraries and headers necessary
+for developing tpm-tools applications.
 
 %prep
 %setup -q
@@ -55,14 +66,17 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc LICENSE README
 %attr(755, root, root) %{_bindir}/tpm_*
-%attr(755, root, root) %{_bindir}/tpmtoken_*
 %attr(755, root, root) %{_sbindir}/tpm_*
 %attr(755, root, root) %{_libdir}/libtpm_unseal.so.?.?.?
 %{_libdir}/libtpm_unseal.so.0
 %{_mandir}/man1/tpm_*
-%{_mandir}/man1/tpmtoken_*
 %{_mandir}/man8/tpm_*
 
+%files pkcs11
+%defattr(-,root,root,-)
+%attr(755, root, root) %{_bindir}/tpmtoken_*
+%{_mandir}/man1/tpmtoken_*
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libtpm_unseal.so
@@ -70,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/tpmUnseal*
 
 %changelog
+* Wed Jul 29 2009 Michal Schmidt <mschmidt@redhat.com> 1.3.1-10
+- Split the pkcs11 utilities into a subpackage.
+
 * Wed Jul 29 2009 Michal Schmidt <mschmidt@redhat.com> 1.3.1-9
 - Enable pkcs11 support (tpmtoken_* utilities).