diff --git a/v4/Android.mk b/v4/Android.mk
index c65ca42..c6c1d82 100644
--- a/v4/Android.mk
+++ b/v4/Android.mk
@@ -17,6 +17,24 @@
 # Note: the source code is in java/, not src/, because this code is also part of
 # the framework library, and build/core/pathmap.mk expects a java/ subdirectory.
 
+# A helper sub-library that makes direct use of Eclair APIs.
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-v4-eclair
+LOCAL_SDK_VERSION := 5
+LOCAL_SRC_FILES := $(call all-java-files-under, eclair)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# -----------------------------------------------------------------------
+
+# A helper sub-library that makes direct use of Froyo APIs.
+include $(CLEAR_VARS)
+LOCAL_MODULE := android-support-v4-froyo
+LOCAL_SDK_VERSION := 8
+LOCAL_SRC_FILES := $(call all-java-files-under, froyo)
+include $(BUILD_STATIC_JAVA_LIBRARY)
+
+# -----------------------------------------------------------------------
+
 # A helper sub-library that makes direct use of Honeycomb APIs.
 include $(CLEAR_VARS)
 LOCAL_MODULE := android-support-v4-honeycomb
@@ -31,7 +49,10 @@
 LOCAL_MODULE := android-support-v4
 LOCAL_SDK_VERSION := 4
 LOCAL_SRC_FILES := $(call all-java-files-under, java)
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4-honeycomb
+LOCAL_STATIC_JAVA_LIBRARIES += \
+        android-support-v4-eclair \
+        android-support-v4-froyo \
+        android-support-v4-honeycomb
 include $(BUILD_STATIC_JAVA_LIBRARY)
 
 # Include this library in the build server's output directory