diff --git a/src/bpm-package/main.go b/src/bpm-package/main.go
index 0e19ba4..bee7bf3 100644
--- a/src/bpm-package/main.go
+++ b/src/bpm-package/main.go
@@ -231,11 +231,13 @@ func compilePackage(archive string) {
 			os.Rename(line, newPath)
 			outputPkgs[pkgInfo.Name] = newPath
 
-			bpmutilsshared.UpdateDatabases(repo)
 		} else {
 			outputPkgs[pkgInfo.Name] = line
 		}
 	}
+	if repo := bpmutilsshared.GetRepository(); repo != "" && *moveToBinaryDir {
+		bpmutilsshared.UpdateDatabases(repo)
+	}
 
 	// Print out generated packages
 	for k, v := range outputPkgs {