diff --git a/build/sdk.atree b/build/sdk.atree
index 1cc868b..7e0c2a5 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -199,18 +199,18 @@
 sdk/files/README_add-ons.txt add-ons/README.txt
 
 ##############################################################################
-# Extra Component: Compatibility
+# Extra Component: Support
 ##############################################################################
 
-development/sdk/compatibility_source.properties                                                   extras/android/compatibility/source.properties
-development/sdk/compatibility_README.txt                                                          extras/android/compatibility/README.txt
-sdk/files/sdk_files_NOTICE.txt                                                                    extras/android/compatibility/NOTICE.txt
-${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar    extras/android/compatibility/v4/android-support-v4.jar
-frameworks/support/v4                                                                             extras/android/compatibility/v4/src
-development/samples/Support4Demos                                                                 extras/android/compatibility/v4/samples/Support4Demos
-${OUT_DIR}/target/common/obj/PACKAGING/android-support-v13_intermediates/android-support-v13.jar  extras/android/compatibility/v13/android-support-v13.jar
-frameworks/support/v13                                                                            extras/android/compatibility/v13/src
-development/samples/Support13Demos                                                                extras/android/compatibility/v13/samples/Support13Demos
+development/sdk/support_source.properties                                                         extras/android/support/source.properties
+development/sdk/support_README.txt                                                                extras/android/support/README.txt
+sdk/files/sdk_files_NOTICE.txt                                                                    extras/android/support/NOTICE.txt
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v4_intermediates/android-support-v4.jar    extras/android/support/v4/android-support-v4.jar
+frameworks/support/v4                                                                             extras/android/support/v4/src
+development/samples/Support4Demos                                                                 extras/android/support/v4/samples/Support4Demos
+${OUT_DIR}/target/common/obj/PACKAGING/android-support-v13_intermediates/android-support-v13.jar  extras/android/support/v13/android-support-v13.jar
+frameworks/support/v13                                                                            extras/android/support/v13/src
+development/samples/Support13Demos                                                                extras/android/support/v13/samples/Support13Demos
 
 ##############################################################################
 # Tests Component
diff --git a/sdk/compatibility_source.properties b/sdk/compatibility_source.properties
deleted file mode 100644
index f23e52a..0000000
--- a/sdk/compatibility_source.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-Pkg.UserSrc=false
-Pkg.Revision=3
diff --git a/sdk/compatibility_README.txt b/sdk/support_README.txt
similarity index 81%
rename from sdk/compatibility_README.txt
rename to sdk/support_README.txt
index 7752b3b..2d3ba25 100644
--- a/sdk/compatibility_README.txt
+++ b/sdk/support_README.txt
@@ -1,8 +1,9 @@
-Compatibility Libraries for Android.
+Support Libraries for Android.
 
 This SDK component contains static libraries providing access to newer APIs
-on older platforms. To use those libraries, simply copy them as static libraries
-into your project.
+on older platforms and various helper classes.
+
+To use those libraries, simply copy them as static libraries into your project.
 
 Each library is called v<api>, indicating the minimum API level that they require.
 
@@ -21,7 +22,7 @@
 
 *** V13 ***
 
-Provides the same features as v4, plus:
+v13/android-support-v13.jar provides the same features as v4, plus:
 - FragmentPagerAdapter: Implementation of PagerAdapter that represents each page as a Fragment.
 
 v13/src/ is the source code for the compatibility library, not including the v4 source
diff --git a/sdk/support_source.properties b/sdk/support_source.properties
new file mode 100644
index 0000000..b75e326
--- /dev/null
+++ b/sdk/support_source.properties
@@ -0,0 +1,2 @@
+Pkg.UserSrc=false
+Pkg.Revision=4