diff --git a/.cvsignore b/.cvsignore
index 8bb7eb2..72dd767 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-freeradius-0.9.3.tar.gz
+freeradius-1.0.0-pre3.tar.gz
diff --git a/freeradius-1.0.0-ltdl_no_la.patch b/freeradius-1.0.0-ltdl_no_la.patch
new file mode 100644
index 0000000..5d5fa70
--- /dev/null
+++ b/freeradius-1.0.0-ltdl_no_la.patch
@@ -0,0 +1,45 @@
+--- freeradius-1.0.0-pre3/src/modules/rlm_eap/eap.c.ltdl_no_la	2004-05-05 19:20:40.000000000 +0300
++++ freeradius-1.0.0-pre3/src/modules/rlm_eap/eap.c	2004-06-29 12:33:04.000000000 +0300
+@@ -82,7 +82,11 @@
+ 	snprintf(buffer, sizeof(buffer), "rlm_eap_%s", eaptype_name);
+ 
+ 	/* Link the loaded EAP-Type */
+-	handle = lt_dlopenext(buffer);
++	char *tmp = malloc(strlen(buffer) + 4);
++	strcpy(tmp, buffer);
++	strcat(tmp, ".so");
++	handle = lt_dlopenext(tmp);
++	free(tmp);
+ 	if (handle == NULL) {
+ 		radlog(L_ERR, "rlm_eap: Failed to link EAP-Type/%s: %s",
+ 		       eaptype_name, lt_dlerror());
+--- freeradius-1.0.0-pre3/src/main/modules.c.ltdl_no_la	2004-04-23 22:50:29.000000000 +0300
++++ freeradius-1.0.0-pre3/src/main/modules.c	2004-06-29 12:30:42.000000000 +0300
+@@ -204,7 +204,11 @@
+ 	/*
+ 	 *	Keep the handle around so we can dlclose() it.
+ 	 */
+-	handle = lt_dlopenext(module_name);
++	char *tmp = malloc(strlen(module_name) + 4);
++	strcpy(tmp, module_name);
++	strcat(tmp, ".so");
++	handle = lt_dlopenext(tmp);
++	free(tmp);
+ 	if (handle == NULL) {
+ 		radlog(L_ERR|L_CONS, "%s[%d] Failed to link to module '%s':"
+ 				" %s\n", cffilename, cflineno, module_name, lt_dlerror());
+--- freeradius-1.0.0-pre3/src/modules/rlm_sql/rlm_sql.c.ltdl_no_la	2004-05-25 09:56:43.000000000 +0300
++++ freeradius-1.0.0-pre3/src/modules/rlm_sql/rlm_sql.c	2004-06-29 12:30:42.000000000 +0300
+@@ -668,7 +668,11 @@
+ 		return -1;
+ 	}
+ 
+-	inst->handle = lt_dlopenext(inst->config->sql_driver);
++	char *tmp = malloc(strlen(inst->config->sql_driver) + 4);
++	strcpy(tmp, inst->config->sql_driver);
++	strcat(tmp, ".so");
++	inst->handle = lt_dlopenext(tmp);
++	free(tmp);
+ 	if (inst->handle == NULL) {
+ 		radlog(L_ERR, "rlm_sql (%s): Could not link driver %s: %s",
+ 		       inst->config->xlat_name, inst->config->sql_driver,
diff --git a/freeradius.spec b/freeradius.spec
index 03683e9..84490b4 100644
--- a/freeradius.spec
+++ b/freeradius.spec
@@ -1,20 +1,21 @@
 Summary: High-performance and highly configurable free RADIUS server.
 Name: freeradius
-Version: 0.9.3
-Release: 5
+Version: 1.0.0
+Release: 0.pre3.1
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.freeradius.org/
-Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.gz
+Source0: ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}-pre3.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires: chkconfig net-snmp krb5-libs net-snmp-utils
 BuildRequires: net-snmp-devel net-snmp-utils krb5-devel openldap-devel postgresql-devel perl mysql-devel unixODBC-devel gdbm-devel
-Patch1: freeradius-0.9.0-ltdl_no_la.patch
+Patch1: freeradius-1.0.0-ltdl_no_la.patch
 Patch2: freeradius-0.9.0-libdir.patch
 Patch3: freeradius-0.9.0-pam-multilib.patch
 Patch4: freeradius-0.9.0-com_err.patch
-Patch5: freeradius-0.9.3-pie.patch
+Patch5: freeradius-1.0.0-pie.patch
 Patch6: freeradius-0.9.3-gcc34.patch
+Patch7: freeradius-1.0.0-sasl2.patch
 
 %description
 The FreeRADIUS Server Project is a high performance and highly configurable 
@@ -93,13 +94,14 @@ done when adding or deleting new users.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-pre3
 %patch1 -p1 -b .ltdl_no_la
 %patch2 -p1 -b .libdir
 %patch3 -p1 -b .pam-multilib
 %patch4 -p1 -b .com_err
 %patch5 -p1 -b .pie
 %patch6 -p1 -b .gcc34
+%patch7 -p1 -b .sasl2
 
 %build
 %ifarch s390 s390x
@@ -191,6 +193,7 @@ fi
 %config (noreplace) /etc/raddb/[a-ce-z]*
 %config /etc/raddb/dictionary*
 %{_bindir}/*
+%{_libdir}/libeap*.so
 %{_libdir}/libradius*.so
 %{_libdir}/rlm_[a-r]*.so
 %{_libdir}/rlm_sql-%{version}*.so
@@ -222,6 +225,10 @@ fi
 
 
 %changelog
+* Thu Jul  1 2004 Thomas Woerner <twoerner@redhat.com> 1.0.0-0.pre3.1
+- third "pre" release of version 1.0.0
+- rlm_ldap is using SASLv2 (#126507)
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index 454d6c1..f7fdbdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36f33d9dd305a2c9f1089c30a9fff0b8  freeradius-0.9.3.tar.gz
+b6c62cac7d1f8da6d7ad3b4749f2248c  freeradius-1.0.0-pre3.tar.gz