diff --git a/drupalorg_drush.drush.inc b/drupalorg_drush.drush.inc
index 8314fd6..1e64302 100644
--- a/drupalorg_drush.drush.inc
+++ b/drupalorg_drush.drush.inc
@@ -165,7 +165,7 @@ function drupalorg_drush_make_validate_info($info) {
         'DrushMakeDo_DownloadGit',
         'DrushMakeDo_DownloadURL',
         'DrushMakeDo_ProjectPatch',
-        'DrushMakeDo_ProjectUpdateXML',
+        'DrushMakeDo_SetReleaseMetadata',
       ),
     );
     $pass = TRUE;
@@ -538,14 +538,16 @@ class DrushMakeDo_ProjectPatch extends DrushMakeDo_Transformer {
   }
   */
 }
-class DrushMakeDo_ProjectUpdateXML extends DrushMakeDo_Transformer {
+class DrushMakeDo_SetReleaseMetadata extends DrushMakeDo_Transformer {
   function verify(&$project_data, $project, $core) {
-    $project_data += array(
-      'name' => $project,
-      'core' => $core,
-      'location' => drush_get_option('make-update-default-url', RELEASE_INFO_DEFAULT_URL),
-    );
-    $project_data = drupalorg_drush_updatexml($project_data);
+    if (drush_get_option('drupal-org-log-package-items-to-file')) {
+      $project_data += array(
+        'name' => $project,
+        'core' => $core,
+        'location' => drush_get_option('make-update-default-url', RELEASE_INFO_DEFAULT_URL),
+      );
+      drupalorg_drush_set_release_metadata($project_data);
+    }
     return $project_data;
   }
   /**
@@ -556,57 +558,24 @@ class DrushMakeDo_ProjectUpdateXML extends DrushMakeDo_Transformer {
 }
 
 /**
- * Custom extension of Drush's release_info system.
+ * Find and store release node information about a project.
+ *
+ * If a valid release node is found for the project configuration, metadata
+ * is stored in the file specified by DRUPALORG_DRUSH_PACKAGE_CONTENTS_FILE.
  *
- * Only allows loading update XML files from the default location, which for
- * our purposes is updates.drupal.org. This is also the place where package
- * items are collected for the package.
+ * TODO: In the future, output the metadata as JSON?
  */
-function drupalorg_drush_updatexml($project) {
-
-  if ($filename = _make_download_file(drush_get_option('make-update-default-url', RELEASE_INFO_DEFAULT_URL) . '/' . $project['name'] . '/' . $project['core'])) {
-    $release_history = simplexml_load_string(file_get_contents($filename));
-    drush_op('unlink', $filename);
-  }
-  // First, get the release history.
-  if (!is_object($release_history) || !$release_history->title) {
-    make_error('XML_ERROR', dt("Could not retrieve version information for %project.", array('%project' => $project['name'])));
-    return FALSE;
-  }
-  $project['release_history'] = $release_history;
-  if (!isset($project['type'])) {
-    // Determine the project type.
-    $term_map = array(
-      'Modules' => 'module',
-      'Themes' => 'theme',
-      'Drupal core' => 'core',
-      'Installation profiles' => 'profile',
-      'Translations' => 'translation'
-    );
-    // Iterate through all terms related to this project.
-    foreach ($release_history->terms->term as $term) {
-      // If we find a term from the term map, add it.
-      if (in_array((string) $term->value, array_keys($term_map))) {
-        $project['type'] = $term_map[(string)$term->value];
-        break;
-      }
-    }
-    if (!isset($project['type'])) {
-      make_error('BUILD_ERROR', dt("Unable to determine project type for %project.", array('%project' => $project['name'])));
-      return FALSE;
-    }
-  }
-  // Process the file download data, and record the item_nid for the package.
-  $type = $project['type'] == 'core' ? 'core' : 'contrib';
+function drupalorg_drush_set_release_metadata(&$project) {
+  $type = $project['name'] == 'drupal' ? 'core' : 'contrib';
   $request = make_prepare_request($project, $type);
-  if ($release = release_info_fetch($request)) {
-    // Optionally log package contents to a file.
-    if (drush_get_option('drupal-org-log-package-items-to-file')) {
+  $xml = updatexml_get_release_history_xml($request);
+  if ($xml) {
+    $request['project_type'] = $project['type'] = updatexml_determine_project_type($xml);
+    // Try to identify the most appropriate release.
+    if ($release = updatexml_parse_release($request, $xml, 'version')) {
       drupalorg_drush_write_package_item_nid($release);
     }
-    return $project;
   }
-  return FALSE;
 }
 
 /**
