diff --git a/.gitignore b/.gitignore
index e25e180..9025377 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 tomcatjss-1.2.0.tar.gz
 /tomcatjss-2.0.0.tar.gz
 /tomcatjss-2.1.1.tar.gz
+/tomcatjss-6.0.0.tar.gz
diff --git a/clog b/clog
index 571f555..fbc2558 100644
--- a/clog
+++ b/clog
@@ -1,3 +1,4 @@
-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
+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)
diff --git a/sources b/sources
index 984de93..dc6bef8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98866d8008b25b32edfb6f5ef6040cc1  tomcatjss-2.1.1.tar.gz
+f8fd93ebf2b47c84c975d0bf90a7f5bb  tomcatjss-6.0.0.tar.gz
diff --git a/tomcatjss.spec b/tomcatjss.spec
index e52e236..f8cd5df 100644
--- a/tomcatjss.spec
+++ b/tomcatjss.spec
@@ -1,5 +1,5 @@
 Name:     tomcatjss
-Version:  2.1.1
+Version:  6.0.0
 Release:  1%{?dist}
 Summary:  JSSE implementation using JSS for Tomcat
 URL:      http://pki.fedoraproject.org/
@@ -19,7 +19,7 @@ BuildRequires:    tomcat6 >= 6.0.30-6
 %else
 BuildRequires:    tomcat6
 %endif
-BuildRequires:    jss >= 4.2.6-15
+BuildRequires:    jss >= 4.2.6-17
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
@@ -28,7 +28,7 @@ Requires:         tomcat6 >= 6.0.30-6
 %else
 Requires:         tomcat6
 %endif
-Requires:         jss >= 4.2.6-15
+Requires:         jss >= 4.2.6-17
 
 # The 'tomcatjss' package conflicts with the 'tomcat-native' package
 # because it uses an underlying NSS security model rather than the
@@ -81,6 +81,12 @@ rm -rf %{buildroot}
 %{_javadir}/*
 
 %changelog
+* 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