diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5f1a789ff9..31367c8059 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-07-17 15:01 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbver.h
+  * package/harbour.spec
+  * package/harbour-win.spec.in
+  * package/winuni/mpkg_win_uni.bat
+  * package/harbour-wce.spec.in
+  * package/harb_win.mft
+    * trunk version bump. 2.1.0rc2 -> 3.1.0dev
+
+---------- branch 3.0 created ----------
+
 2011-07-17 14:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * ChangeLog
     ! typo
diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h
index 66078b3781..af0322679c 100644
--- a/harbour/include/hbver.h
+++ b/harbour/include/hbver.h
@@ -59,10 +59,10 @@
    #undef __HARBOUR__
 #endif
 
-#define HB_VER_MAJOR    2        /* Major version number */
+#define HB_VER_MAJOR    3        /* Major version number */
 #define HB_VER_MINOR    1        /* Minor version number */
 #define HB_VER_RELEASE  0        /* Release number */
-#define HB_VER_STATUS   "rc2"    /* Build status (all lowercase) */
-#define __HARBOUR__     0x020100 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */
+#define HB_VER_STATUS   "dev"    /* Build status (all lowercase) */
+#define __HARBOUR__     0x030100 /* Three bytes: Major + Minor + Release. This is recommented for 3rd party .c and .prg level code. */
 
 #endif /* HB_VER_H_ */
diff --git a/harbour/package/harb_win.mft b/harbour/package/harb_win.mft
index d4eeee95e4..1448de784b 100644
--- a/harbour/package/harb_win.mft
+++ b/harbour/package/harb_win.mft
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!-- Copyright © 1999-2011 (see application banner) -->
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="2.1.0.0"
+  <assemblyIdentity version="3.1.0.0"
      processorArchitecture="*"
      name="Harbour Project"
      type="win32"/>
diff --git a/harbour/package/harbour-wce.spec.in b/harbour/package/harbour-wce.spec.in
index 2d8d0e2d84..6fb8272b6b 100644
--- a/harbour/package/harbour-wce.spec.in
+++ b/harbour/package/harbour-wce.spec.in
@@ -14,8 +14,8 @@
 ######################################################################
 
 %define name      harbour-wce
-%define version   2.1.0
-%define releasen  rc2
+%define version   3.1.0
+%define releasen  dev
 
 # Workaround for the problem of /usr/bin/strip not handling PE binaries.
 %define hb_ccpath /opt/mingw32ce/bin
diff --git a/harbour/package/harbour-win.spec.in b/harbour/package/harbour-win.spec.in
index e686dcb043..267a2cbea8 100644
--- a/harbour/package/harbour-win.spec.in
+++ b/harbour/package/harbour-win.spec.in
@@ -14,8 +14,8 @@
 ######################################################################
 
 %define name      harbour-win
-%define version   2.1.0
-%define releasen  rc2
+%define version   3.1.0
+%define releasen  dev
 
 # Workaround for the problem of /usr/bin/strip not handling PE binaries.
 %define hb_ccpath /opt/xmingw/bin
diff --git a/harbour/package/harbour.spec b/harbour/package/harbour.spec
index 4223eb5b19..8b92633445 100644
--- a/harbour/package/harbour.spec
+++ b/harbour/package/harbour.spec
@@ -53,8 +53,8 @@
 
 %define name      harbour
 %define dname     Harbour
-%define version   2.1.0
-%define releasen  rc2
+%define version   3.1.0
+%define releasen  dev
 %define hb_etcdir /etc/%{name}
 %define hb_plat   export HB_PLATFORM=linux
 %define hb_cc     export HB_COMPILER=gcc
diff --git a/harbour/package/winuni/mpkg_win_uni.bat b/harbour/package/winuni/mpkg_win_uni.bat
index 9a528d1f81..e9d5d50e18 100644
--- a/harbour/package/winuni/mpkg_win_uni.bat
+++ b/harbour/package/winuni/mpkg_win_uni.bat
@@ -16,10 +16,10 @@ rem - Run this from vanilla official source tree only.
 
 echo ! Self: %0
 
-if "%HB_VS%" == "" set HB_VS=21
-if "%HB_VL%" == "" set HB_VL=210
-if "%HB_VM%" == "" set HB_VM=2.1
-if "%HB_VF%" == "" set HB_VF=2.1.0rc2
+if "%HB_VS%" == "" set HB_VS=31
+if "%HB_VL%" == "" set HB_VL=310
+if "%HB_VM%" == "" set HB_VM=3.1
+if "%HB_VF%" == "" set HB_VF=3.1.0dev
 if "%HB_RT%" == "" set HB_RT=C:\hb\
 
 set HB_DR=hb%HB_VS%\