diff --git a/.cvsignore b/.cvsignore
index f18d04d..192b4e3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-ldapsdk_java_20000505.tar.gz
+jss34.jar
+ldapsdk_java_20020819.tar.gz
diff --git a/ldapjdk.spec b/ldapjdk.spec
index fe24408..d9ddca1 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -1,9 +1,9 @@
 %define name		ldapjdk
 %define spname		ldapsp
-%define version		4.1
+%define version		4.17
 %define tar_name	ldapsdk_java
-%define tar_version	20000505
-%define release		5jpp_1rh
+%define tar_version	20020819
+%define release		1jpp_1rh
 %define section		free
 
 Name:		%{name}
@@ -15,9 +15,10 @@ License:	MPL
 Group:		Development/Java
 URL:		http://www.mozilla.org/directory/javasdk.html
 Source0:	ftp://ftp.mozilla.org/pub/directory/java-sdk/%{tar_name}_%{tar_version}.tar.gz
-#based on the http://bugzilla.mozilla.org/show_bug.cgi?id=55984 zip
-Patch0:		%{name}-%{version}-DSMLWriter.patch
-Patch1:		ldapjdk-javaxssl.patch
+# FIXME: A jpackage must be created for the
+# Mozilla Network Security Services for Java (JSS)
+Source2:        jss34.jar
+
 Requires:	oro
 Requires:	jaas
 Requires:	jndi
@@ -49,9 +50,6 @@ Javadoc for %{name}
 %prep
 %setup -q -c
 
-%patch0 -p1
-%patch1 -p0
-
 %build
 # cleanup CVS dirs
 rm -fr $(find . -name CVS -type d)
@@ -63,7 +61,11 @@ rm -fr mozilla
 cd java-sdk
 if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
 
-export CLASSPATH=$(build-classpath oro jndi jaas jsse)
+# FIXME: A jpackage must be created for this
+cp %{SOURCE2} .
+export CLASSPATH=`pwd`/jss34.jar:%(build-classpath oro jndi jaas jsse)
+export MOZ_SRC=`pwd`
+export JAVA_VERSION=1.4
 
 # Main jar
 %__make -f ldap.mk clean
@@ -115,6 +117,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Tue Nov 16 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp_1rh
+- Merge with upstream for upgrade
+
+* Thu Aug 26 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp
+- Upgrade to 4.17
+- Rebuilt with Ant 1.6.2
+
 * Fri Mar  5 2004 Frank Ch. Eigler <fche@redhat.com> 0:4.1-5jpp_1rh
 - RH vacuuming
 - added ldapjdk-javaxssl.patch to stop using com.sun.*
diff --git a/sources b/sources
index 1ef888d..7bdaaa5 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-804f4f3268f24db4a81d0dda2e2c4be9  ldapsdk_java_20000505.tar.gz
+e25a48d3c992a713a9d1b7b90673e90d  jss34.jar
+f0eef8fc5c4961cdebdd9b9188228431  ldapsdk_java_20020819.tar.gz