diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 45544d658e..55defe037c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,12 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-06-04 12:34 UTC-0400 Phil Barnett <philb/at/philb.us>
+  * Set version in harbour.spec to 0.9.9-RC1
+  * Set version in include/hbver.h to 0.9.9-RC1
+  * Update header info in doc/whatsnew.txt to proper date and release tag
+  * Tag repository with RC1
+
 2008-06-04 04:02 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/bin/hb-mkslib.sh
   * harbour/bin/hb-func.sh
diff --git a/harbour/doc/whatsnew.txt b/harbour/doc/whatsnew.txt
index cc6ceae1f2..eb73f730e3 100644
--- a/harbour/doc/whatsnew.txt
+++ b/harbour/doc/whatsnew.txt
@@ -3,7 +3,7 @@
  */
 
 
-Version 1.1.1 RC1 (2008-05-20) tag: build49
+Version 0.9.9 RC1 (2008-06-04) tag: RC1
 
 General
 =============================
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index e8fa7837b9..a56f49d8d6 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -60,7 +60,7 @@
 
 %define name     harbour
 %define dname    Harbour
-%define version  1.1.1
+%define version  0.9.9-RC1
 %define releasen 0
 %define hb_pref  hb
 %define hb_arch  export HB_ARCHITECTURE=linux
diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h
index 21044b00b3..7ebb15a8cb 100644
--- a/harbour/include/hbver.h
+++ b/harbour/include/hbver.h
@@ -55,10 +55,10 @@
 
 /* NOTE: One of these next three fields can be incremented by the hbverfix program */
 
-#define HB_VER_MAJOR    1       /* Major version number */
-#define HB_VER_MINOR    1       /* Minor version number */
-#define HB_VER_REVISION 1       /* Revision number */
-#define HB_VER_STATUS   "devel" /* Build status */
+#define HB_VER_MAJOR    0       /* Major version number */
+#define HB_VER_MINOR    9       /* Minor version number */
+#define HB_VER_REVISION 9       /* Revision number */
+#define HB_VER_STATUS   "RC1"   /* Build status */
 
 /* #include "hb_verbld.h" */