diff --git a/README.md b/README.md
index ff01c8f11..42d420523 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,25 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob
 
 ## Version History
 
+### Development Build: v7.0.0-rc4+dev39
+
+- Use cfe time clock state enum t in cmd/tlm and handling
+- EVS functional test add for different event types
+- Patch for recursive event loop
+- CFE_ES_MemAddOff structure to associated CFE_ES_MemAddress_t and CFE_ES_MemOffset_t
+- Avoid aliasing warnings
+- Message ID type improvements
+- CFE_SB_ValueToMsgId/MsgIdToValue wrappers
+- Use CFE_TIME_ClockState_Enum_t in cmd/tlm and handling
+- Consolidate repeated MSG stub setup in sb_UT
+- Return type conversions in CFE_ES_GetTaskName
+- Better message type pointer conversion
+- Replacing hardcoded message limit in TIME services
+- Use macro in CFE_ResourceId_IsDefined
+- Checking against IsNewOffset only
+- Set new build baseline for cFS-Caelum-rc4: v7.0.0-rc4
+- See <https://github.com/nasa/cFE/pull/2001> and <https://github.com/nasa/cFS/pull/390>
+
 ### Development Build: v6.8.0-rc1+dev1030
 
 - Grammatical cleanup of requirements
diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
index eac498eef..1fc040e91 100644
--- a/modules/core_api/fsw/inc/cfe_version.h
+++ b/modules/core_api/fsw/inc/cfe_version.h
@@ -28,14 +28,21 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   1030         /**< @brief Development: Number of development commits since baseline */
-#define CFE_BUILD_BASELINE "v6.8.0-rc1" /**< @brief Development: Reference git tag for build number */
+#define CFE_BUILD_NUMBER   39           /**< @brief Development: Number of development commits since baseline */
+#define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* Version Macro Definitions updated for official releases only */
-#define CFE_MAJOR_VERSION 6  /**< @brief Major release version (Former for Revision == 99) */
-#define CFE_MINOR_VERSION 7  /**< @brief Minor release version (Former for Revision == 99) */
-#define CFE_REVISION      99 /**< @brief Revision, 99 indicates development */
-#define CFE_MISSION_REV   0  /**< @brief Mission revision, reserved for mission use */
+#define CFE_MAJOR_VERSION 6 /**< @brief Major release version (Former for Revision == 99) */
+#define CFE_MINOR_VERSION 7 /**< @brief Minor release version (Former for Revision == 99) */
+#define CFE_REVISION      0 /*!< @brief ONLY APPLY for OFFICIAL releases. Revision number.      */
+
+/*!
+ * @brief Mission revision.
+ *
+ * Set to 0 on OFFICIAL releases, and set to 255 (0xFF) on development versions.
+ * Values 1-254 are reserved for mission use to denote patches/customizations as needed.
+ */
+#define CFE_MISSION_REV 0xFF /**< @brief Mission revision, reserved for mission use */
 
 #define CFE_STR_HELPER(x) #x                /**< @brief Convert argument to string */
 #define CFE_STR(x)        CFE_STR_HELPER(x) /**< @brief Expand macro before conversion */
@@ -55,6 +62,6 @@
  * and official releases.
  */
 #define CFE_VERSION_STRING \
-    " cFE DEVELOPMENT BUILD " CFE_SRC_VERSION " (Codename: Bootes), Last Official Release: cfe v6.7.0"
+    " cFE DEVELOPMENT BUILD " CFE_SRC_VERSION " (Codename: Draco), Last Official Release: cfe v6.7.0"
 
 #endif /* CFE_VERSION_H */