diff --git a/mapserver.h b/mapserver.h
index d6491d4171..26e4187070 100644
--- a/mapserver.h
+++ b/mapserver.h
@@ -32,10 +32,10 @@
 /*
 ** MapServer version - to be updated for every release
 */
-#define MS_VERSION "6.3-dev"
+#define MS_VERSION "6.2-beta3"
 
 #define MS_VERSION_MAJOR    6
-#define MS_VERSION_MINOR    3
+#define MS_VERSION_MINOR    2
 #define MS_VERSION_REV      0
 
 #define MS_VERSION_NUM (MS_VERSION_MAJOR*10000+MS_VERSION_MINOR*100+MS_VERSION_REV)
diff --git a/msautotest b/msautotest
index 1e920c1a37..aefd52736c 160000
--- a/msautotest
+++ b/msautotest
@@ -1 +1 @@
-Subproject commit 1e920c1a37397593dc978f1e0ba6d9f4e3318c20
+Subproject commit aefd52736c53392b8453a7572823d8931ce0d10d