diff --git a/build.go b/build.go
index ca6f52ecd89..39c55c799ad 100644
--- a/build.go
+++ b/build.go
@@ -73,7 +73,7 @@ func main() {
 
 		case "package":
 			//verifyGitRepoIsClean()
-			grunt("release")
+			// grunt("release")
 			createLinuxPackages()
 
 		case "latest":
@@ -89,8 +89,13 @@ func main() {
 }
 
 func makeLatestDistCopies() {
+	rpmIteration := "-1"
+	if linuxPackageIteration != "" {
+		rpmIteration = "-" + linuxPackageIteration
+	}
+
 	runError("cp", "dist/grafana_"+version+"_amd64.deb", "dist/grafana_latest_amd64.deb")
-	runError("cp", "dist/grafana-"+strings.Replace(version, "-", "_", 5)+"-1.x86_64.rpm", "dist/grafana-latest-1.x86_64.rpm")
+	runError("cp", "dist/grafana-"+linuxPackageVersion+rpmIteration+".x86_64.rpm", "dist/grafana-latest-1.x86_64.rpm")
 	runError("cp", "dist/grafana-"+version+".linux-x64.tar.gz", "dist/grafana-latest.linux-x64.tar.gz")
 }