diff --git a/Android.mk b/Android.mk
index 2e397eb..6a69d25 100644
--- a/Android.mk
+++ b/Android.mk
@@ -224,8 +224,7 @@ LOCAL_DROIDDOC_OPTIONS:= \
         -exclude org.cyanogenmod.platform.internal \
         -api $(INTERNAL_CM_PLATFORM_API_FILE) \
         -removedApi $(INTERNAL_CM_PLATFORM_REMOVED_API_FILE) \
-        -nodocs \
-        -verbose
+        -nodocs
 
 LOCAL_UNINSTALLABLE_MODULE := true
 
@@ -256,8 +255,7 @@ LOCAL_DROIDDOC_OPTIONS:=\
         -exclude org.cyanogenmod.platform.internal \
         -api $(INTERNAL_CM_PLATFORM_SYSTEM_API_FILE) \
         -removedApi $(INTERNAL_CM_PLATFORM_SYSTEM_REMOVED_API_FILE) \
-        -nodocs \
-        -verbose
+        -nodocs
 
 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:= build/tools/droiddoc/templates-sdk
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 3f23969..98c9b74 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -41,8 +41,10 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/org.cyanogenmod.
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/org.cyanogenmod.platform_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/org.cyanogenmod.platform.sdk_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/org.cyanogenmod.platform.internal_intermediates)
-$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/docs/cm-api-stubs-timestamp)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/cmsdk_stubs_current_intermediates)
 # KeyguardExternalView uses a new interface which requires cleaning to avoid a runtime exception
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/org.cyanogenmod.platform_intermediates)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/org.cyanogenmod.platform.sdk_intermediates)
+# Purge out the api stubs timestamp files (they're used as a dependency for checkapi-cm)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/docs/cm-api-stubs*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/docs/cm-system-api-stubs*)