diff --git a/jss.spec b/jss.spec
index b9a28a5..649efa4 100644
--- a/jss.spec
+++ b/jss.spec
@@ -153,28 +153,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Mon Dec  6 2010 John Dennis <jdennis@redhat.com> - 4.2.6-9
-- Resolves: bug #654657 - Incorrect socket accept error message due to bad pointer arithmetic
-  added patch jss-bad-error-string-pointer.patch
+- Resolves: bug 654657 - <jdennis@redhat.com>
+  Incorrect socket accept error message due to bad pointer arithmetic
 
 * Mon Nov 1 2010 Christina Fu <cfu@redhat.com> 4.2.6-8
-- Bugzilla Bug # 647364 - Expose updated certificate verification function in JSS
+- Resolves: bug 647364 - <cfu@redhat.com>
+  Expose updated certificate verification function in JSS
 
 * Wed Oct 20 2010 Christina Fu <cfu@redhat.com> 4.2.6-7
-- Bugzilla Bug # 638833 - rfe ecc - add ec curve name support in JSS and CS
-- Bugzilla Bug # 529945 - expose NSS calls for OCSP settings
+- Resolves: bug 529945 - <cfu@redhat.com>
+  expose NSS calls for OCSP settings
+- Resolves: bug 638833 - <cfu@redhat.com>
+  rfe ecc - add ec curve name support in JSS and CS
 
 * Wed Jan 13 2010 Rob Crittenden <rcritten@redhat.com> 4.2.6-6
 - Need to explicitly catch UnsatisfiedLinkError exception for System.load()
 
 * Thu Jan  7 2010 Rob Crittenden <rcritten@redhat.com> 4.2.6-5
-- Move location of libjss4.so to subdirectory and use System.load() to
+- Resolves: bug 533304 - <rcritten@redhat.com>
+  Move location of libjss4.so to subdirectory and use System.load() to
   load it instead of System.loadLibrary() for Fedora packaging compliance
-  (#533304)
 
 * Fri Jul 31 2009 Rob Crittenden <rcritten@redhat.com> 4.2.6-4
-- Support ECC POP on the server (#224688)
-- Server Sockets are hard coded to IPV4 (#469456)
-- Set NSS dependency >= 3.12.3.99
+- Resolves: bug 224688 - <cfu@redhat.com>
+  Support ECC POP on the server
+- Resolves: bug 469456 - <jmagne@redhat.com>
+  Server Sockets are hard coded to IPV4
+- Resolves: bug 509183 - <mharmsen@redhat.com>
+  Set NSS dependency >= 3.12.3.99
 
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
@@ -183,13 +189,18 @@ rm -rf $RPM_BUILD_ROOT
 - Include patch to fix missing @param so javadocs will build
 
 * Fri Jun  5 2009 Rob Crittenden <rcritten@redhat.com> 4.2.6-1
-- Update to 4.2.6
-- Include patch to add jss interface to PK11_GenerateKeyPairWithOpFlags()
-- Add javadocs subpackage
+- Resolves: bug 455305 - <cfu@redhat.com>
+  CA ECC Signing Key Failure
+- Resolves: bug 502111 - <cfu@redhat.com>
+  Need JSS interface for NSS's PK11_GenerateKeyPairWithOpFlags() function
+- Resolves: bug 503809 - <cfu@redhat.com>
+  Update JSS version to 4.2.6
+- Resolves: bug 503817 - <cfu@redhat.com>
+  Create JSS Javadocs as their own RPM
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
- 
+
 * Tue Aug  5 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 4.2.5-3
 - fix license tag