diff --git a/apache2/modsecurity.c b/apache2/modsecurity.c
index c024d21f..f1092eb1 100644
--- a/apache2/modsecurity.c
+++ b/apache2/modsecurity.c
@@ -17,12 +17,12 @@
 #include "msc_util.h"
 
 modsec_build_type_rec DSOLOCAL modsec_build_type[] = {
-    { "dev", 1 },     /* Development build */
-    { "rc", 3 },      /* Release Candidate build */
-    { "", 9 },        /* Production build */
-    { "breach", 9 },  /* Breach build */
-    { "trunk", 9 },   /* Trunk build */
-    { NULL, -1 }      /* terminator */
+    { "-dev", 1 },     /* Development build */
+    { "-rc", 3 },      /* Release Candidate build */
+    { "", 9 },         /* Production build */
+    { "-breach", 9 },  /* Breach build */
+    { "-trunk", 9 },   /* Trunk build */
+    { NULL, -1 }       /* terminator */
 };
 
 /**
diff --git a/apache2/modsecurity.h b/apache2/modsecurity.h
index ceca8c76..5f861599 100644
--- a/apache2/modsecurity.h
+++ b/apache2/modsecurity.h
@@ -63,13 +63,16 @@ 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        "rc"
-#define MODSEC_VERSION_RELEASE     "1"
+#define MODSEC_VERSION_TYPE        ""
+#define MODSEC_VERSION_RELEASE     ""
 
 #define MODULE_NAME "ModSecurity for Apache"
+
+#define MODSEC_VERSION_SUFFIX MODSEC_VERSION_TYPE MODSEC_VERSION_RELEASE
 #define MODULE_RELEASE \
   MODSEC_VERSION_MAJOR "." MODSEC_VERSION_MINOR "." MODSEC_VERSION_MAINT \
-  "-" MODSEC_VERSION_TYPE MODSEC_VERSION_RELEASE
+  MODSEC_VERSION_SUFFIX
+
 #define MODULE_NAME_FULL MODULE_NAME "/" MODULE_RELEASE " (http://www.modsecurity.org/)"
 
 #define PHASE_REQUEST_HEADERS       1