diff --git a/CHANGES b/CHANGES
index 78db1bb3..5a3774f6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
-12 Dec 2007 - 2.5.0-dev3
-------------------------
+12 Dec 2007 - 2.5.0-rc1
+-----------------------
 
  * Added IS_NEW and IS_EXPIRED built-in collection variables.
 
diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h
index 95cb2e7b..a9c8a79f 100644
--- a/apache2/modsecurity.h
+++ b/apache2/modsecurity.h
@@ -65,14 +65,14 @@ extern DSOLOCAL modsec_build_type_rec modsec_build_type[];
 #define MODSEC_VERSION_MAJOR       "2"
 #define MODSEC_VERSION_MINOR       "5"
 #define MODSEC_VERSION_MAINT       "0"
-#define MODSEC_VERSION_TYPE        "dev"
-#define MODSEC_VERSION_RELEASE     "3"
+#define MODSEC_VERSION_TYPE        "rc"
+#define MODSEC_VERSION_RELEASE     "1"
 
 #define MODULE_NAME "ModSecurity for Apache"
 #define MODULE_RELEASE \
   MODSEC_VERSION_MAJOR "." MODSEC_VERSION_MINOR "." MODSEC_VERSION_MAINT \
   "-" MODSEC_VERSION_TYPE MODSEC_VERSION_RELEASE
-#define MODULE_NAME_FULL MODULE_NAME "/" MODULE_RELEASE " (http://www.modsecurity.org)"
+#define MODULE_NAME_FULL MODULE_NAME "/" MODULE_RELEASE " (http://www.modsecurity.org/)"
 
 #define PHASE_REQUEST_HEADERS       1
 #define PHASE_REQUEST_BODY          2
@@ -83,7 +83,7 @@ extern DSOLOCAL modsec_build_type_rec modsec_build_type[];
 #define PHASE_LAST                  PHASE_LOGGING
 
 #define NOT_SET                    -1l
-#define NOT_SET_P          (void *)-1l
+#define NOT_SET_P         ((void *)-1l)
 
 #define CREATEMODE ( APR_UREAD | APR_UWRITE | APR_GREAD )
 #define CREATEMODE_DIR ( APR_UREAD | APR_UWRITE | APR_UEXECUTE | APR_GREAD | APR_GEXECUTE )
diff --git a/doc/modsecurity2-apache-reference.xml b/doc/modsecurity2-apache-reference.xml
index 6e711fd7..a05136be 100644
--- a/doc/modsecurity2-apache-reference.xml
+++ b/doc/modsecurity2-apache-reference.xml
@@ -3,7 +3,7 @@
   <title>ModSecurity Reference Manual</title>
 
   <articleinfo>
-    <releaseinfo>Version 2.5.0-dev?/ (October 15, 2007)</releaseinfo>
+    <releaseinfo>Version 2.5.0-rc1/ (December 12, 2007)</releaseinfo>
 
     <copyright>
       <year>2004-2007</year>
@@ -5156,4 +5156,4 @@ SecRule REQUEST_METHOD "!<emphasis>@within %{tx.allowed_methods}</emphasis>" t:l
       </section>
     </section>
   </section>
-</article>
\ No newline at end of file
+</article>