diff --git a/.gitignore b/.gitignore
index 7163bb6..02d1946 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,7 @@ slapi-nis-0.14.tar.gz
 slapi-nis-0.15.tar.gz
 slapi-nis-0.16.tar.gz
 slapi-nis-0.17.tar.gz
+/slapi-nis-0.18.tar.gz
+/slapi-nis-0.19.tar.gz
+/slapi-nis-0.20.tar.gz
+/slapi-nis-0.21.tar.gz
diff --git a/slapi-nis.spec b/slapi-nis.spec
index eb4deab..f1a831e 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -1,22 +1,26 @@
 Name:		slapi-nis
-Version:	0.17
-Release:	4%{?dist}
+Version:	0.21
+Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://slapi-nis.fedorahosted.org/
 Source0:	https://fedorahosted.org/releases/s/l/slapi-nis/slapi-nis-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildRequires:	389-ds-base-devel, mozldap-devel, tcp_wrappers-devel
 
 %description
-This slapi-nis package contains two plugins which aim to ease the
-transition of a network from NIS to LDAP.  The NIS Server plugin
-(nisserver-plugin) allows the directory server itself to act as a NIS
-server, and the Schema Compatibility plugin (schemacompat-plugin)
-allows the directory server to provide modified views of data stored
-in the directory.
+This package provides two plugins for Red Hat and 389 Directory Server.
+
+The NIS Server plugin allows the directory server to act as a NIS server
+for clients, dynamically generating and updating NIS maps according to
+its configuration and the contents of the DIT, and serving the results to
+clients using the NIS protocol as if it were an ordinary NIS server.
+
+The Schema Compatibility plugin allows the directory server to provide an
+alternate view of entries stored in part of the DIT, optionally adding,
+dropping, or renaming attribute values, and optionally retrieving values
+for attributes from multiple entries in the tree.
 
 %prep
 %setup -q
@@ -31,7 +35,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 rm $RPM_BUILD_ROOT/%{_libdir}/dirsrv/plugins/*.la
 
 %if 0
-# ns-slapd doesn't want to start in koji
+# ns-slapd doesn't want to start in koji, so no tests get run
 %check
 make check
 %endif
@@ -41,11 +45,36 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING NEWS README STATUS doc/*.txt doc/*.ldif
+%doc COPYING NEWS README STATUS doc/*.txt doc/examples/*.ldif
 %{_libdir}/dirsrv/plugins/*.so
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Tue Nov 18 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.21-1
+- update to 0.21
+  - schema-compat: don't look at standalone compat containers for a search,
+    since we'll already have looked at the group container
+
+* Tue Nov 18 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.20-1
+- update to 0.20
+  - add a deref_f function
+
+* Mon Nov 17 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.19-1
+- fix a brown-paper-bag crash
+
+* Mon Nov 17 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.18-1
+- update to 0.18
+  - add a deref_rf function
+  - schema-compat: don't respond to search requests for which there's no backend
+  - schema-compat: add the ability to do standalone compat containers
+
+* Wed Nov 17 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.17-6
+- revert that last change, it's unnecessary
+
+* Thu Nov 11 2010 Nalin Dahyabhai <nalin@redhat.com> - 0.17-5
+- build against either 389-ds-base or redhat-ds-base, whichever is probably
+  more appropriate here
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.17-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 607e42e..6379da6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ee2ce26e0f4dc291c0d0ca523024b21  slapi-nis-0.17.tar.gz
+44adaca43ca62a1219597f1f238eeaeb  slapi-nis-0.21.tar.gz