diff --git a/cyrus-sasl.spec b/cyrus-sasl.spec
index af0e23d..a4bf6a7 100644
--- a/cyrus-sasl.spec
+++ b/cyrus-sasl.spec
@@ -1,22 +1,40 @@
 Summary: The Cyrus SASL library.
 Name: cyrus-sasl
 Version: 1.5.24
-Release: 6
+Release: 11
 Copyright: distributable
 Group: System Environment/Libraries
 Source: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-%{version}.tar.gz
 URL: http://asg.web.cmu.edu/sasl/sasl-library.html
 Patch0: cyrus-sasl-1.5.21-des.patch
 Buildroot: %{_tmppath}/%{name}-root
-BuildPrereq: openssl-devel
+BuildPrereq: krb5-devel, openssl-devel
 Requires: pam
 Prereq: /sbin/ldconfig
 
 %description
-The cyrus-sasl package contains the Cyrus SASL implementation.  SASL is the
+The %{name} package contains the Cyrus SASL implementation.  SASL is the
 Simple Authentication and Security Layer, a method for adding authentication
 support to connection-based protocols.
 
+%package devel
+Requires: %{name} = %{version}-%{release}
+Group: Development/Libraries
+Summary: Files needed for developing applications with Cyrus SASL.
+
+%description devel
+The %{name}-devel package contains files needed for developing and
+compiling applications which use the Cyrus SASL library.
+
+%package gssapi
+Requires: %{name} = %{version}-%{release}
+Group: System Environment/Libraries
+Summary: GSSAPI support for Cyrus SASL.
+
+%description gssapi
+The %{name}-gssapi package contains the Cyrus SASL plugins which support
+GSSAPI authentication.  GSSAPI is commonly used for Kerberos authentication.
+
 %prep
 %setup -q
 %patch0 -p1 -b .des
@@ -27,7 +45,7 @@ autoconf
 	--with-plugindir=%{_libdir}/sasl \
 	--with-dblib=gdbm \
 	--disable-krb4 \
-	--disable-gssapi \
+	--enable-gssapi=/usr/kerberos \
 	--with-rc4 \
 	--enable-anon \
 	--enable-cram \
@@ -49,14 +67,50 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING NEWS README TODO doc/*.html doc/*.txt
-%{_includedir}/*.h
-%{_libdir}/libsasl*
-%{_libdir}/sasl/
-%{_mandir}/*/*
+%{_libdir}/libsasl*.so.*
+%dir %{_libdir}/sasl/
+%{_libdir}/sasl/*anonymous*.so*
+%{_libdir}/sasl/*crammd5*.so*
+%{_libdir}/sasl/*digestmd5*.so*
+%{_libdir}/sasl/*login*.so*
+%{_libdir}/sasl/*plain*.so*
+%{_mandir}/man8/*
 %{_sbindir}/saslpasswd
 %{_sbindir}/sasldblistusers
 
+# %files devel
+# %defattr(-,root,root)
+%{_includedir}/*.h
+%{_libdir}/libsasl*.*a
+%{_libdir}/libsasl*.*so
+%{_libdir}/sasl/*anonymous*.*a
+%{_libdir}/sasl/*crammd5*.*a
+%{_libdir}/sasl/*digestmd5*.*a
+%{_libdir}/sasl/*gssapi*.*a
+%{_libdir}/sasl/*login*.*a
+%{_libdir}/sasl/*plain*.*a
+%{_mandir}/man3/*
+
+# %files gssapi
+# %defattr(-,root,root)
+# %{_libdir}/sasl/*gssapi*.so*
+
 %changelog
+* Wed Oct 25 2000 Nalin Dahyabhai <nalin@redhat.com>
+- make sure the version of 1.5.24 in the package matches the master (#18968)
+- re-merge -devel and main for an errata candidate
+
+* Mon Oct  9 2000 Nalin Dahyabhai <nalin@redhat.com>
+- re-add the libsasl.so symlink to the -devel package (oops)
+
+* Fri Oct  6 2000 Nalin Dahyabhai <nalin@redhat.com>
+- move .so files for modules to their respective packages -- they're not -devel
+  links meant for use by ld anyway
+
+* Thu Oct  5 2000 Nalin Dahyabhai <nalin@redhat.com>
+- split off -devel subpackage
+- add a -gssapi subpackage for the gssapi plugins
+
 * Wed Aug 16 2000 Nalin Dahyabhai <nalin@redhat.com>
 - fix the summary text
 
diff --git a/sources b/sources
index 97c5693..e6e6aaa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aedc0f8b594e2a13503b375ed78f62b7  cyrus-sasl-1.5.24.tar.gz
+ac3837c071c258b80021325936db2583  cyrus-sasl-1.5.24.tar.gz