diff --git a/modules/update/update.manager.inc b/modules/update/update.manager.inc
index c7c4e4a68a..ca4a144177 100644
--- a/modules/update/update.manager.inc
+++ b/modules/update/update.manager.inc
@@ -113,24 +113,28 @@ function update_manager_update_form($form, $form_state, $context) {
       $project_name .= ' ' . t('(Theme)');
     }
 
-    if (empty($project['recommended'])) {
+    if (empty($project['recommended']) && $project['status'] != UPDATE_NOT_SUPPORTED) {
       // If we don't know what to recommend they upgrade to, we should skip
       // the project entirely.
       continue;
     }
 
-    $recommended_release = $project['releases'][$project['recommended']];
-    $recommended_version = $recommended_release['version'] . ' ' . l(t('(Release notes)'), $recommended_release['release_link'], array('attributes' => array('title' => t('Release notes for @project_title', array('@project_title' => $project['title'])))));
-    if ($recommended_release['version_major'] != $project['existing_major']) {
-      $recommended_version .= '<div title="Major upgrade warning" class="update-major-version-warning">' . t('This update is a major version update which means that it may not be backwards compatible with your currently running version.  It is recommended that you read the release notes and proceed at your own risk.') . '</div>';
-    }
-
-    // Create an entry for this project.
-    $entry = array(
-      'title' => $project_name,
-      'installed_version' => $project['existing_version'],
-      'recommended_version' => $recommended_version,
-    );
+		if($project['status'] != UPDATE_NOT_SUPPORTED) {
+			$recommended_release = $project['releases'][$project['recommended']];
+			$recommended_version = $recommended_release['version'] . ' ' . l(t('(Release notes)'), $recommended_release['release_link'], array('attributes' => array('title' => t('Release notes for @project_title', array('@project_title' => $project['title'])))));
+			if ($recommended_release['version_major'] != $project['existing_major']) {
+				$recommended_version .= '<div title="Major upgrade warning" class="update-major-version-warning">' . t('This update is a major version update which means that it may not be backwards compatible with your currently running version.  It is recommended that you read the release notes and proceed at your own risk.') . '</div>';
+			}
+		} else {
+			$recommended_version = '<div class="update-major-version-warning">' . t('This module/theme is unsupported! Upgrading or disabling is strongly recommended.') . '</div>';
+		}
+		
+		// Create an entry for this project.
+		$entry = array(
+			'title' => $project_name,
+			'installed_version' => $project['existing_version'],
+			'recommended_version' => $recommended_version,
+		);
 
     switch ($project['status']) {
       case UPDATE_NOT_SECURE:
@@ -192,7 +196,13 @@ function update_manager_update_form($form, $form_state, $context) {
 
       case 'module':
       case 'theme':
-        $projects['enabled'][$name] = $entry;
+				if($project['status'] == UPDATE_NOT_SUPPORTED) {
+					unset($entry['#weight']);
+					unset($entry['#attributes']);
+        	$projects['unsupported'][$name] = $entry;
+				} else {
+					$projects['enabled'][$name] = $entry;
+				}
         break;
 
       case 'module-disabled':
@@ -217,7 +227,7 @@ function update_manager_update_form($form, $form_state, $context) {
     'installed_version' => t('Installed version'),
     'recommended_version' => t('Recommended version'),
   );
-
+	
   if (!empty($projects['enabled'])) {
     $form['projects'] = array(
       '#type' => 'tableselect',
@@ -260,7 +270,16 @@ function update_manager_update_form($form, $form_state, $context) {
       '#weight' => 120,
     );
   }
-
+	
+	if (!empty($projects['unsupported'])) {
+		$form['unsupported_projects'] = array(
+      '#type' => 'markup',
+      '#markup' => theme('table', array('header' => $headers, 'rows' => $projects['unsupported'])),
+			'#prefix' => '<h2>' . t('Unsupported') . '</h2>',
+			'#weight' => 130,
+    );
+  }
+	
   return $form;
 }