diff --git a/.gitignore b/.gitignore
index cd91abb..e25e180 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 tomcatjss-1.2.0.tar.gz
 /tomcatjss-2.0.0.tar.gz
+/tomcatjss-2.1.1.tar.gz
diff --git a/clog b/clog
index fd1b28c..571f555 100644
--- a/clog
+++ b/clog
@@ -1 +1,3 @@
-- Updated 'tomcatjss' to utilize 'tomcat6'.
+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
diff --git a/sources b/sources
index ee398fd..984de93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bc433c70483017a2abfe950c38f8f70d  tomcatjss-2.0.0.tar.gz
+98866d8008b25b32edfb6f5ef6040cc1  tomcatjss-2.1.1.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index 21b830e..e52e236 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,6 +1,6 @@
 Name:     tomcatjss
-Version:  2.0.0
-Release:  2%{?dist}
+Version:  2.1.1
+Release:  1%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
 License:  LGPLv2+
@@ -14,13 +14,21 @@ Source0:  http://pki.fedoraproject.org/pki/sources/%{name}/%{name}-%{version}.ta
 BuildRequires:    ant
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
+%if 0%{?fedora} >= 15
+BuildRequires:    tomcat6 >= 6.0.30-6
+%else
 BuildRequires:    tomcat6
-BuildRequires:    jss >= 4.2.6
+%endif
+BuildRequires:    jss >= 4.2.6-15
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
+%if 0%{?fedora} >= 15
+Requires:         tomcat6 >= 6.0.30-6
+%else
 Requires:         tomcat6
-Requires:         jss >= 4.2.6
+%endif
+Requires:         jss >= 4.2.6-15
 
 # The 'tomcatjss' package conflicts with the 'tomcat-native' package
 # because it uses an underlying NSS security model rather than the
@@ -73,8 +81,16 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+* 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'.