diff --git a/.cvsignore b/.cvsignore
index 192b4e3..6fcbb4c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,5 @@
 jss34.jar
 ldapsdk_java_20020819.tar.gz
+ldapjdk-4.17
+noarch
+*.src.rpm
diff --git a/ldapjdk.spec b/ldapjdk.spec
index d9ddca1..aff7816 100644
--- a/ldapjdk.spec
+++ b/ldapjdk.spec
@@ -3,8 +3,9 @@
 %define version		4.17
 %define tar_name	ldapsdk_java
 %define tar_version	20020819
-%define release		1jpp_1rh
+%define release		1jpp_1fc
 %define section		free
+%define use_nonfree	%{?_with_nonfree:1}%{!?_without_nonfree:0}
 
 Name:		%{name}
 Version:	%{version}
@@ -20,15 +21,21 @@ Source0:	ftp://ftp.mozilla.org/pub/directory/java-sdk/%{tar_name}_%{tar_version}
 Source2:        jss34.jar
 
 Requires:	oro
-Requires:	jaas
 Requires:	jndi
 Requires:	jpackage-utils >= 0:1.5
+%if %{use_nonfree}
+Requires:	jaas
 Requires:	jsse
+%endif
+Requires:  	java-sasl
 BuildRequires:	oro
-BuildRequires:	jaas
 BuildRequires:	jndi
 BuildRequires:	jpackage-utils >= 0:1.5
+%if %{use_nonfree}
+BuildRequires:	jaas
 BuildRequires:	jsse
+%endif
+BuildRequires:  java-sasl
 Provides:	jndi-ldap = 1.3.0
 BuildArch:	noarch
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -50,6 +57,12 @@ Javadoc for %{name}
 %prep
 %setup -q -c
 
+# delete stuff that doesn't work with libgcj (#132524).
+if java -version 2>&1 | grep -q "gcj"; then
+    (cd mozilla/directory/java-sdk/ldapjdk/netscape/ldap/factory && \
+     rm -f JSSESocketFactory.java)
+fi
+
 %build
 # cleanup CVS dirs
 rm -fr $(find . -name CVS -type d)
@@ -63,7 +76,7 @@ if [ ! -e "$JAVA_HOME" ] ; then export JAVA_HOME="%{_jvmdir}/java" ; fi
 
 # FIXME: A jpackage must be created for this
 cp %{SOURCE2} .
-export CLASSPATH=`pwd`/jss34.jar:%(build-classpath oro jndi jaas jsse)
+export CLASSPATH=`pwd`/jss34.jar:%(build-classpath oro jndi jaas jsse sasl)
 export MOZ_SRC=`pwd`
 export JAVA_VERSION=1.4
 
@@ -117,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}-%{version}/*
 
 %changelog
+* Fri Jan 21 2005 Gary Benson <gbenson@redhat.com> 0:4.17-1jpp_1rh
+- Build into Fedora.
+
 * Tue Nov 16 2004 Fernando Nasser <fnasser@redhat.com> 0:4.17-1jpp_1rh
 - Merge with upstream for upgrade