diff --git a/CHANGES b/CHANGES
index a48d2865bb3de4ca17fa378dd3024c3bd623556d..188c1261d61110e46b034059d1ad40d6496bfedf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
 OpenLDAP Change Log
 
-Changes included in OpenLDAP 1.2 Release Engineering
-	CVS Tag: OPENLDAP_REL_ENG_1_2
+Changes included in OpenLDAP 1.2.5
+	CVS Tag: OPENLDAP_REL_ENG_1_2_5
 	Fixed slapd substring_comp_candidates null intersection bug (ITS#228)
 	Fixed slapd modify: delete of last attribute value bug (ITS#229)
 	Fixed slapd print in signal handler bug (ITS#230)
diff --git a/build/version b/build/version
index 69dedc64a7ce44420d904f017d1a3f9453a40ee8..f69dd1e0ef67416e68821340b1c1121274db799c 100644
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.2-Engineering
+1.2.5-Release