diff --git a/drupalorg_project/plugins/release_packager/DrupalorgProjectPackageRelease.class.php b/drupalorg_project/plugins/release_packager/DrupalorgProjectPackageRelease.class.php
index 7cb6859..283be55 100644
--- a/drupalorg_project/plugins/release_packager/DrupalorgProjectPackageRelease.class.php
+++ b/drupalorg_project/plugins/release_packager/DrupalorgProjectPackageRelease.class.php
@@ -192,6 +192,14 @@ class DrupalorgProjectPackageRelease implements ProjectReleasePackagerInterface
   protected function fixInfoFileVersion($file, $project_short_name, $version) {
     global $site_name;
 
+    if (preg_match('/^((\d+\.x-\d+\.)x)-dev$/', $this->release_version, $matches)) {
+      // No need to initalize this variable because it is taken by reference.
+      drupal_exec('git describe --tags $(git rev-list --topo-order  --max-count=1 HEAD)', $last_tag);
+      $last_tag = $last_tag[0];
+      if (preg_match('/^('. $matches[2] .'\d+(?:-[^-]+)?)((-\d+-)g[0-9a-f]{7})?$/', $last_tag, $matches)) {
+        $this->release_version = isset($matches[2]) ? $matches[1] . $matches[3] . 'dev' : $last_tag;
+      }
+    }
     $info = "\n; Information added by $site_name packaging script on " . gmdate('Y-m-d') . "\n";
     $info .= 'version = "' . $this->release_version . "\"\n";