diff --git a/.gitignore b/.gitignore
index 3a129ac..d4d5c0f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,5 @@ slapi-nis-0.17.tar.gz
 /slapi-nis-0.37.tar.gz.sig
 /slapi-nis-0.38.tar.gz
 /slapi-nis-0.38.tar.gz.sig
+/slapi-nis-0.40.tar.gz
+/slapi-nis-0.40.tar.gz.sig
diff --git a/slapi-nis.spec b/slapi-nis.spec
index 6342d28..a9d940c 100644
--- a/slapi-nis.spec
+++ b/slapi-nis.spec
@@ -5,7 +5,7 @@
 %endif
 
 Name:		slapi-nis
-Version:	0.38
+Version:	0.40
 Release:	1%{?dist}
 Summary:	NIS Server and Schema Compatibility plugins for Directory Server
 Group:		System Environment/Daemons
@@ -70,6 +70,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/nisserver-plugin-defs
 
 %changelog
+* Fri Mar 30 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.40-1
+- treat padding values passed to the "link" function as expressions to be
+  evaluated rather than simply as literal values (part of #767372)
+
+* Wed Mar 28 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.39-1
+- add a "default" function for trying to evaluate one expression, then
+  another, then another... (part of #767372)
+- when creating a compat entry based on a real entry, set an entryUSN based on
+  the source entry or the rootDSE (freeipa #864); the "scaffolding" entries
+  won't have them
+
 * Tue Mar  6 2012 Nalin Dahyabhai <nalin@redhat.com> - 0.38-1
 - properly escape RDN values when building compat entries (#796509, #800625)
 
diff --git a/sources b/sources
index 4fea521..f94eaa9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-789916ff281e72e2be881f3922430e39  slapi-nis-0.38.tar.gz
-c560714ad839210aef5026844e85a925  slapi-nis-0.38.tar.gz.sig
+193c94f70dcf390c36acb154c404b777  slapi-nis-0.40.tar.gz
+1c976f2acef0fb4ed6d8c0e05ea972b0  slapi-nis-0.40.tar.gz.sig