diff --git a/.cvsignore b/.cvsignore
index 996de70..c0c1d42 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-openldap-2.4.21.tgz
+openldap-2.4.22.tgz
 db-4.8.26.tar.gz
diff --git a/ldap.init b/ldap.init
index f6dc1b1..54cab29 100644
--- a/ldap.init
+++ b/ldap.init
@@ -3,7 +3,7 @@
 # slapd	This shell script takes care of starting and stopping
 #	ldap servers (slapd).
 #
-# chkconfig: - 12 73
+# chkconfig: - 27 73
 # description: LDAP stands for Lightweight Directory Access Protocol, used \
 #              for implementing the industry standard directory services.
 # processname: slapd
@@ -261,12 +261,12 @@ case "$1" in
 	start
 	;;
     usage)
-	echo $"Usage: $0 {start|stop|restart|status|condrestart|configtest|usage}"
+	echo $"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|configtest|usage}"
 	RETVAL=0
 	;;
     *)
-	echo $"Usage: $0 {start|stop|restart|status|condrestart|configtest|usage}"
-	RETVAL=3
+	echo $"Usage: $0 {start|stop|restart|force-reload|status|condrestart|try-restart|configtest|usage}"
+	RETVAL=2
 esac
 
 exit $RETVAL
diff --git a/openldap.spec b/openldap.spec
index c420d6b..45194a6 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -3,7 +3,7 @@
 # not work with some versions of OpenLDAP.
 %define db_version 4.8.26
 %define ldbm_backend berkeley
-%define version 2.4.21
+%define version 2.4.22
 %define evolution_connector_prefix %{_libdir}/evolution-openldap
 %define evolution_connector_includedir %{evolution_connector_prefix}/include
 %define evolution_connector_libdir %{evolution_connector_prefix}/%{_lib}
@@ -11,7 +11,7 @@
 Summary: LDAP support libraries
 Name: openldap
 Version: %{version}
-Release: 6%{?dist}
+Release: 1%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -631,6 +631,12 @@ fi
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Tue May 04 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.22-1
+- rebased to 2.4.22 (mostly bugfixes, added back-ldif, back-null testing support)
+- due to some possible issues pointed out in last update testing phase, I'm
+  pulling back the last change (slapd can't be moved since it depends on /usr
+  possibly mounted from network)
+
 * Fri Mar 19 2010 Jan Zeleny <jzeleny@redhat.com> - 2.4.21-6
 - moved slapd to start earlier during boot sequence
 
diff --git a/sources b/sources
index f3aef1c..e083f0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e7128c57b2bacd940e8906057c94ff26  openldap-2.4.21.tgz
+ef01b52255ce8e3fbf8aa34f6fe7598b  openldap-2.4.22.tgz
 3476bac9ec0f3c40729c8a404151d5e3  db-4.8.26.tar.gz