diff -ru anaconda-13.21.215/textw/upgrade_text.py anaconda-13.21.215.new/textw/upgrade_text.py
--- anaconda-13.21.215/textw/upgrade_text.py	2014-01-01 20:29:02.283571144 -0500
+++ anaconda-13.21.215.new/textw/upgrade_text.py	2014-01-01 20:27:59.035865533 -0500
@@ -222,10 +222,10 @@
 
         parts = anaconda.id.rootParts
         cur_arch = os.uname()[4]
-    if cur_arch == 'i686':
-        cur_arch = '32'
-    else:
-        cur_arch = '64'
+	if cur_arch == 'i686':
+	    cur_arch = '32'
+	else:
+	    cur_arch = '64'
 
         height = min(len(parts), 11) + 1
         if height == 12:
@@ -235,36 +235,24 @@
         partList = []
         partList.append(_("Reinstall System"))
 
-    if (anaconda.id.upgrade == None and anaconda.dispatch.stepInSkipList("installtype")) or anaconda.id.upgrade:
-            default = 1
-        else:
-            default = 0
-
-    sys_is_not_upgradeable = 0
+        default = 1
 
-    upgradeable_partitions = len(parts)
-    if upgradeable_partitions != 1:
-        sys_is_not_upgradeable = 1
-        header = _("System has problem")
-        reason = _("Your system is not upgradeable. There is more than one SME server partition.")
+	sys_is_not_upgradeable = 0
+	
+	upgradeable_partitions = len(parts)
+	if upgradeable_partitions != 1:
+	    sys_is_not_upgradeable = 1
+	    header = _("System has problem")
+	    reason = _("Your system is not upgradeable. There is more than one MSL partition. Contact Mitel support for recovery instructions.")
 
         (drive, desc, arch) = parts[0]
+        #for (device, desc) in parts:
+        #    partList.append("%s (%s)" %(desc, device.path))
 
-    if arch != cur_arch:
-        sys_is_not_upgradeable = 1
-        header = _("Wrong SME server version")
-        reason = _("Your system is not upgradeable using this version of SME server. The currently installed system is a %s bit version, but this version of SME server is a %s bit version.") % (arch, cur_arch)
-
-    if sys_is_not_upgradeable:
-            partList.append(_("Reboot system"))
-        (button, choice) =  ListboxChoiceWindow(screen, header,
-                            reason, partList,
-                                                [ TEXT_OK_BUTTON,
-                                                  TEXT_BACK_BUTTON ],
-                                                width = 55, scroll = scroll,
-                                                height = height,
-                                                help = "upgraderoot",
-                                                default = 1)
+	if arch != cur_arch:
+	    sys_is_not_upgradeable = 1
+	    header = _("Wrong MSL version")
+	    reason = _("Your system is not upgradeable using this version of MSL. The currently installed system is a %s bit version, but this version of MSL is a %s bit version.") % (arch, cur_arch)
 
             if button == TEXT_BACK_CHECK:
                 return INSTALL_BACK
@@ -277,9 +265,9 @@
                     sys.exit(1)
 
         partList.append(_("Upgrade existing \"%s\" system") %(desc))
-
+ 
         (button, choice) =  ListboxChoiceWindow(screen, _("System to Upgrade"),
-                            _("Your system is upgradeable."), partList,
+                             _("Your system is upgradeable."), partList,
                                                 [ TEXT_OK_BUTTON,
                                                   TEXT_BACK_BUTTON ],
                                                 width = 55, scroll = scroll,
@@ -303,6 +291,7 @@
             anaconda.id.rootParts = parts
             anaconda.dispatch.skipStep("installtype", skip = 1)
         else:
+            anaconda.id.setUpgrade(False)
             anaconda.dispatch.skipStep("installtype", skip = 0)
             anaconda.id.upgradeRoot = None