diff --git a/java/androidmk.go b/java/androidmk.go
index c6ecfbce5..40711f627 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -320,7 +320,7 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData {
 					fmt.Fprintln(w, "droidcore: checkapi")
 				}
 				if ddoc.updateCurrentApiTimestamp != nil {
-					fmt.Fprintln(w, ".PHONY:", ddoc.Name(), "-update-current-api")
+					fmt.Fprintln(w, ".PHONY:", ddoc.Name()+"-update-current-api")
 					fmt.Fprintln(w, ddoc.Name()+"-update-current-api:",
 						ddoc.updateCurrentApiTimestamp.String())
 
diff --git a/java/system_modules.go b/java/system_modules.go
index 73a513128..d98e0abc9 100644
--- a/java/system_modules.go
+++ b/java/system_modules.go
@@ -134,6 +134,7 @@ func (system *SystemModules) AndroidMk() android.AndroidMkData {
 			fmt.Fprintln(w, makevar, ":=", system.outputFile.String())
 			fmt.Fprintln(w, ".KATI_READONLY", ":=", makevar)
 			fmt.Fprintln(w, name+":", "$("+makevar+")")
+			fmt.Fprintln(w, ".PHONY:", name)
 			fmt.Fprintln(w)
 			makevar = "SOONG_SYSTEM_MODULES_LIBS_" + name
 			fmt.Fprintln(w, makevar, ":=", strings.Join(system.properties.Libs, " "))