diff --git a/.tomcatjss.metadata b/.tomcatjss.metadata
new file mode 100644
index 0000000..3e2583f
--- /dev/null
+++ b/.tomcatjss.metadata
@@ -0,0 +1 @@
+1032c2417165b219a5ea360bf4b8df7829e40464 SOURCES/tomcatjss-7.1.0.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 0e7897f..0000000
--- a/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-The master branch has no content
-
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
-
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SPECS/tomcatjss.spec b/SPECS/tomcatjss.spec
new file mode 100644
index 0000000..dc4131d
--- /dev/null
+++ b/SPECS/tomcatjss.spec
@@ -0,0 +1,124 @@
+Name: tomcatjss
+Version: 7.1.0
+Release: 3%{?dist}
+Summary: JSSE implementation using JSS for Tomcat
+URL: http://pki.fedoraproject.org/
+License: LGPLv2+
+Group: System Environment/Libraries
+
+BuildArch: noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+
+Source0: http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.tar.gz
+
+# jpackage-utils requires versioning to meet both build and runtime requirements
+# jss requires versioning to meet both build and runtime requirements
+# tomcat requires versioning to meet both build and runtime requirements
+BuildRequires: ant
+BuildRequires: java-devel
+BuildRequires: jpackage-utils >= 0:1.7.5-15
+BuildRequires: jss >= 4.2.6-24
+BuildRequires: tomcat >= 7.0.40
+
+Requires: java
+Requires: jpackage-utils >= 0:1.7.5-15
+Requires: jss >= 4.2.6-24
+Requires: tomcat >= 7.0.40
+
+# The 'tomcatjss' package conflicts with the 'tomcat-native' package
+# because it uses an underlying NSS security model rather than the
+# OpenSSL security model, so these two packages may not co-exist.
+# (see Bugzilla Bug #441974 for details)
+Conflicts: tomcat-native
+
+%if 0%{?rhel}
+# For EPEL, override the '_sharedstatedir' macro on RHEL
+%define _sharedstatedir /var/lib
+%endif
+
+%description
+A Java Secure Socket Extension (JSSE) implementation
+using Java Security Services (JSS) for Tomcat 7.
+
+NOTE: The 'tomcatjss' package conflicts with the 'tomcat-native' package
+ because it uses an underlying NSS security model rather than the
+ OpenSSL security model, so these two packages may not co-exist.
+
+%prep
+
+%setup -q
+
+%build
+
+ant -f build.xml -Djnidir=%{_jnidir}
+ant -f build.xml -Djnidir=%{_jnidir} dist
+
+%install
+rm -rf %{buildroot}
+
+# Unpack the files we just built
+cd dist/binary
+unzip %{name}-%{version}.zip -d %{buildroot}
+
+# Install our files
+cd %{buildroot}%{_javadir}
+mv %{name}.jar %{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{name}.jar
+mkdir -p %{buildroot}%{_datadir}/doc/%{name}-%{version}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root)
+%doc %attr(644,root,root) README LICENSE
+%attr(00755,root,root) %{_datadir}/doc/%{name}-%{version}
+%{_javadir}/*
+
+%changelog
+* Thu Jun 13 2013 Matthew Harmsen <mharmsen@redhat.com> 7.1.0-3
+- Updated tomcatjss to utilize tomcat-7.0.40.
+- Updated JNIDIR to /usr/lib/java.
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Dec 19 2012 Christina Fu <cfu@redhat.com> 7.1.0-1
+- Bugzila Bug #819554 tomcatjss: Please migrate from tomcat6 to tomcat7
+
+* Thu Aug 2 2012 Matthew Harmsen <mharmsen@redhat.com> 7.0.0-3
+- PKI TRAC Ticket #283 - Dogtag 10: Integrate Tomcat 6 'tomcatjss.jar' and
+ Tomcat 7 'tomcat7jss.jar' in Fedora 18 tomcatjss package
+
+* Wed Jul 26 2012 Matthew Harmsen <mharmsen@redhat.com> 7.0.0-2
+- Fixed runtime 'Requires' cut/paste typos
+
+* Wed Jun 06 2012 Matthew Harmsen <mharmsen@redhat.com> 7.0.0-1
+- Bugzilla Bug #819554 - tomcatjss: Please migrate from tomcat6 to tomcat7
+
+* Thu Sep 22 2011 Matthew Harmsen <mharmsen@redhat.com> 6.0.2-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . . (mharmsen)
+- Bugzilla Bug #699809 - Convert CS to use systemd (alee)
+
+* Mon Sep 12 2011 Matthew Harmsen <mharmsen@redhat.com> 6.0.1-1
+- Bugzilla Bug #734590 - Refactor JNI libraries for Fedora 16+ . . .
+
+* Thu Jul 14 2011 Matthew Harmsen <mharmsen@redhat.com> - 6.0.0-1
+- Bugzilla Bug #702716 - rhcs80 cannot do client auth with pkiconsole
+ (ok with 7.3) (jmagne)
+- Require "jss >= 4.2.6-17" as a build and runtime requirement
+- Bump version 2.1.1 --> 6.0.0 (to better coincide with tomcat6)
+
+* Fri Mar 25 2011 Matthew Harmsen <mharmsen@redhat.com> - 2.1.1-1
+- Require "jss >= 4.2.6-15" as a build and runtime requirement
+- Require "tomcat6 >= 6.0.30-6" as a build and runtime requirement
+ for Fedora 15 and later platforms
+
+* Wed Jan 12 2011 John Dennis <jdennis@redhat.com> - 2.1.0-1
+- bump version to 2.1.0
+ Bug #588323 - Failed to enable cipher 0xc001 (svn rev 105)
+ Bug #634375 - Build tomcatjss against tomcat6 (svn rev 106)
+ Bug #655915 - Disable socket timeouts when socket is first created. (svn rev 107)
+
+* Tue Dec 14 2010 John Dennis <jdennis@redhat.com>
+- Updated 'tomcatjss' to utilize 'tomcat6'.