diff --git a/.cvsignore b/.cvsignore
index e69de29..880d8e0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+tpm-tools-1.3.1.tar.gz
diff --git a/sources b/sources
index e69de29..3f935e1 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ee1706b69bb76cc6d011757ea194f683  tpm-tools-1.3.1.tar.gz
diff --git a/tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch b/tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
new file mode 100644
index 0000000..de8d546
--- /dev/null
+++ b/tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
@@ -0,0 +1,54 @@
+diff -pburN -x 'CVS*' tpm-tools-1.3.1.vanilla/man/man1/Makefile.in tpm-tools-1.3.1/man/man1/Makefile.in
+--- tpm-tools-1.3.1.vanilla/man/man1/Makefile.in	2007-11-21 14:20:17.000000000 -0600
++++ tpm-tools-1.3.1/man/man1/Makefile.in	2007-12-13 13:00:50.000000000 -0600
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.9.5 from Makefile.am.
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -59,6 +59,12 @@ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
++@P11_SUPPORT_TRUE@am__append_1 = tpmtoken_init.1		\
++@P11_SUPPORT_TRUE@			tpmtoken_import.1	\
++@P11_SUPPORT_TRUE@			tpmtoken_objects.1	\
++@P11_SUPPORT_TRUE@			tpmtoken_protect.1	\
++@P11_SUPPORT_TRUE@			tpmtoken_setpasswd.1
++
+ subdir = man/man1
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -110,6 +116,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INTLLIBS = @INTLLIBS@
++INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
+ LDFLAGS = @LDFLAGS@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+@@ -139,6 +146,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POSUB = @POSUB@
+ RANLIB = @RANLIB@
+ RM = @RM@
++SED = @SED@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
+ STRIP = @STRIP@
+@@ -194,14 +202,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+-man1_MANS = tpm_sealdata.1		\
+-			tpm_version.1		\
+-			tpmtoken_init.1		\
+-			tpmtoken_import.1	\
+-			tpmtoken_objects.1	\
+-			tpmtoken_protect.1	\
+-			tpmtoken_setpasswd.1
+-
++man1_MANS = tpm_sealdata.1 tpm_version.1 $(am__append_1)
+ EXTRA_DIST = $(man1_MANS)
+ all: all-am
+ 
diff --git a/tpm-tools.spec b/tpm-tools.spec
new file mode 100644
index 0000000..768aae0
--- /dev/null
+++ b/tpm-tools.spec
@@ -0,0 +1,82 @@
+
+%define name            tpm-tools
+%define version         1.3.1
+%define release         4
+
+Name:             %{name}
+Summary:          Management tools for the TPM hardware
+Version:          %{version}
+Release:          %{release}%{?dist}
+License:          CPL
+Group:            Applications/System
+Source0:          http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
+URL:              http://trousers.sourceforge.net
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    trousers-devel openssl-devel
+Patch0:           tpm-tools-conditionally-build-tpmtoken-manpages-Makefile.in.patch
+
+%description
+tpm-tools is a group of tools to manage and utilize the Trusted Computing
+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        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.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+%configure --disable-pkcs11-support
+make %{?_smp_mflags}
+
+%install
+mkdir -p ${RPM_BUILD_ROOT}
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtpm_unseal.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libtpm_unseal.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc LICENSE README
+%attr(755, root, root) %{_bindir}/tpm_*
+%attr(755, root, root) %{_sbindir}/tpm_*
+%attr(755, root, root) %{_libdir}/libtpm_unseal.so.?.?.?
+%{_libdir}/libtpm_unseal.so.0
+%{_mandir}/man1/tpm_*
+%{_mandir}/man8/tpm_*
+
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libtpm_unseal.so
+%{_includedir}/tpm_tools/
+%{_mandir}/man3/tpmUnseal*
+
+%changelog
+* Tue Dec 18 2007 Kent Yoder <kyoder@users.sf.net> - 1.3.1-4
+- Updated for comments in RHIT#394941 comment #6
+* Fri Dec 14 2007 Kent Yoder <kyoder@users.sf.net> - 1.3.1-3
+- Updated to own the includedir/tpm_tools directory, removed
+requirement on trousers and ldconfig in post/postun
+* Thu Dec 13 2007 Kent Yoder <kyoder@users.sf.net> - 1.3.1-2
+- Updated for Fedora package submission guidelines
+* Fri Nov 16 2007 Kent Yoder <kyoder@users.sf.net> - 1.3.1
+- Updates to configure
+* Fri Oct 05 2007 Kent Yoder <kyoder@users.sf.net> - 1.2.5.1
+- Updated build section to use smp_mflags
+