diff --git a/Branding/branding.sh b/Branding/branding.sh
index c79ec4733..bfa7320ce 100755
--- a/Branding/branding.sh
+++ b/Branding/branding.sh
@@ -33,6 +33,7 @@ BRANDING_XC_PRODUCT_VERSION=${BRANDING_PRODUCT_MAJOR_VERSION}.${BRANDING_PRODUCT
 BRANDING_XC_PRODUCT_5_6_VERSION=5.6
 BRANDING_XC_PRODUCT_6_2_VERSION=6.2
 BRANDING_XC_PRODUCT_6_5_VERSION=6.5
+BRANDING_XC_PRODUCT_7_0_VERSION=7.0
 BRANDING_XENSERVER_UPDATE_URL="http://updates.xensource.com/XenServer/updates.xml"
 BRANDING_HIDDEN_FEATURE=license_nag
 
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index 4c1d54dff..e43bb9765 100755
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34209
+//     Runtime Version:4.0.30319.18444
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -24801,9 +24801,9 @@ namespace XenAdmin {
         /// <summary>
         ///   Looks up a localized string similar to VMs on local disk will prevent disk repartitioning.
         ///
-        ///A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
+        ///A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
         ///
-        ///However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] 7.0, VMs must be moved from local storage first..
+        ///However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] [BRANDING_VERSION_7_0], VMs must be moved from local storage first..
         /// </summary>
         public static string NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_LONG {
             get {
@@ -24823,7 +24823,7 @@ namespace XenAdmin {
         /// <summary>
         ///   Looks up a localized string similar to The disk size of the local storage prevents repartitioning.
         ///
-        ///A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
+        ///A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
         ///
         ///However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained..
         /// </summary>
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index f66e85e41..b1ff45cc2 100755
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -8632,9 +8632,9 @@ It is strongly recommended that you Cancel and apply the latest version of the p
   <data name="NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_LONG" xml:space="preserve">
     <value>VMs on local disk will prevent disk repartitioning.
 
-A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
+A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
 
-However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] 7.0, VMs must be moved from local storage first.</value>
+However, there are VMs on local storage, so the current partitioning scheme will be retained. To benefit from repartitioning on upgrade to [XenServer] [BRANDING_VERSION_7_0], VMs must be moved from local storage first.</value>
   </data>
   <data name="NOT_SAFE_TO_UPGRADE_DEFAULT_WARNING_SHORT" xml:space="preserve">
     <value>{0}: VMs on local disk will prevent disk repartitioning.</value>
@@ -8642,7 +8642,7 @@ However, there are VMs on local storage, so the current partitioning scheme will
   <data name="NOT_SAFE_TO_UPGRADE_NOT_ENOUGH_SPACE_LONG" xml:space="preserve">
     <value>The disk size of the local storage prevents repartitioning.
 
-A new disk partitioning scheme is available in [XenServer] 7.0 that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
+A new disk partitioning scheme is available in [XenServer] [BRANDING_VERSION_7_0] that includes larger dom0 and backup partitions, and dedicated partitions for logging, swap and UEFI.
 
 However, there is not enough space to perform the repartitioning, so the current partitioning scheme will be retained.</value>
   </data>
diff --git a/mk/re-branding.sh b/mk/re-branding.sh
index fa3f61f50..64eecc068 100755
--- a/mk/re-branding.sh
+++ b/mk/re-branding.sh
@@ -67,6 +67,7 @@ rebranding_global()
         -e "s#\[BRANDING_VERSION_5_6\]#${BRANDING_XC_PRODUCT_5_6_VERSION}#g" \
         -e "s#\[BRANDING_VERSION_6_2\]#${BRANDING_XC_PRODUCT_6_2_VERSION}#g" \
         -e "s#\[BRANDING_VERSION_6_5\]#${BRANDING_XC_PRODUCT_6_5_VERSION}#g" \
+        -e "s#\[BRANDING_VERSION_7_0\]#${BRANDING_XC_PRODUCT_7_0_VERSION}#g" \
         -e "s#\[BRANDING_XENSERVER_UPDATE_URL\]#${BRANDING_XENSERVER_UPDATE_URL}#g" \
         $1    
 }