diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index d7eee80..c5d4ae7 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -11,7 +11,7 @@
 
   // This field is accessed from release scripts using simple pattern matching.
   // Therefore, changing this field could break our release scripts.
-  public static final String LABEL = "2.0.57";
+  public static final String LABEL = "2.0.58";
 
   private Version() {
   }
diff --git a/tools/update_prebuilds_in_android.py b/tools/update_prebuilds_in_android.py
index 49a000c..ee2b100 100755
--- a/tools/update_prebuilds_in_android.py
+++ b/tools/update_prebuilds_in_android.py
@@ -80,7 +80,7 @@
   download_path = os.path.join(root, target)
   url = archive.GetUploadDestination(
     hash_or_version,
-    'r8lib.jar.map',
+    target,
     is_hash)
   print 'Downloading: ' + url + ' -> ' + download_path
   utils.download_file_from_cloud_storage(url, download_path)