diff --git a/config/common.mk b/config/common.mk
index 12ddb22d..d133d8d8 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -1,5 +1,10 @@
 PRODUCT_BRAND ?= cyanogenmod
 
+ifneq ($(TARGET_BOOTANIMATION_NAME),)
+    PRODUCT_COPY_FILES += \
+        vendor/cm/prebuilt/common/bootanimation/$(TARGET_BOOTANIMATION_NAME).zip:system/media/bootanimation.zip
+endif
+
 ifdef CM_NIGHTLY
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.rommanager.developerid=cyanogenmodnightly
@@ -44,8 +49,7 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES +=  \
     vendor/cm/proprietary/RomManager.apk:system/app/RomManager.apk \
     vendor/cm/proprietary/Term.apk:system/app/Term.apk \
-    vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm3.so:system/lib/libjackpal-androidterm3.so \
-    vendor/cm/prebuilt/common/bootanimation.zip:system/media/bootanimation.zip
+    vendor/cm/proprietary/lib/armeabi/libjackpal-androidterm3.so:system/lib/libjackpal-androidterm3.so
 
 # Bring in camera effects & videos
 $(call inherit-product, frameworks/base/data/videos/VideoPackage2.mk)
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index 9e34f98c..9a646208 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -15,3 +15,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 PRODUCT_PACKAGES += \
   Mms
+
+ifeq ($(TARGET_BOOTANIMATION_NAME),)
+    PRODUCT_COPY_FILES += \
+        vendor/cm/prebuilt/common/bootanimation/vertical-480x800.zip:system/media/bootanimation.zip
+endif
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index 9b992603..a15d21d9 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -12,3 +12,8 @@ PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.ringtone=CyanTone.ogg \
     ro.config.notification_sound=CyanMessage.ogg \
     ro.config.alarm_alert=CyanAlarm.ogg
+
+ifeq ($(TARGET_BOOTANIMATION_NAME),)
+    PRODUCT_COPY_FILES += \
+        vendor/cm/prebuilt/common/bootanimation/horizontal-1280x800.zip:system/media/bootanimation.zip
+endif
diff --git a/prebuilt/common/bootanimation.zip b/prebuilt/common/bootanimation.zip
deleted file mode 100644
index 528e8407..00000000
Binary files a/prebuilt/common/bootanimation.zip and /dev/null differ
diff --git a/prebuilt/common/bootanimation/horizontal-1024x600.zip b/prebuilt/common/bootanimation/horizontal-1024x600.zip
new file mode 100644
index 00000000..63226407
Binary files /dev/null and b/prebuilt/common/bootanimation/horizontal-1024x600.zip differ
diff --git a/prebuilt/common/bootanimation/horizontal-1024x768.zip b/prebuilt/common/bootanimation/horizontal-1024x768.zip
new file mode 100644
index 00000000..7a802953
Binary files /dev/null and b/prebuilt/common/bootanimation/horizontal-1024x768.zip differ
diff --git a/prebuilt/common/bootanimation/horizontal-1280x800.zip b/prebuilt/common/bootanimation/horizontal-1280x800.zip
new file mode 100644
index 00000000..aba6e3d0
Binary files /dev/null and b/prebuilt/common/bootanimation/horizontal-1280x800.zip differ
diff --git a/prebuilt/common/bootanimation/vertical-240x320.zip b/prebuilt/common/bootanimation/vertical-240x320.zip
new file mode 100644
index 00000000..d58094f9
Binary files /dev/null and b/prebuilt/common/bootanimation/vertical-240x320.zip differ
diff --git a/prebuilt/common/bootanimation/vertical-320x480.zip b/prebuilt/common/bootanimation/vertical-320x480.zip
new file mode 100644
index 00000000..ba9746dd
Binary files /dev/null and b/prebuilt/common/bootanimation/vertical-320x480.zip differ
diff --git a/prebuilt/common/bootanimation/vertical-480x800.zip b/prebuilt/common/bootanimation/vertical-480x800.zip
new file mode 100644
index 00000000..6cb7c778
Binary files /dev/null and b/prebuilt/common/bootanimation/vertical-480x800.zip differ
diff --git a/prebuilt/common/bootanimation/vertical-480x854.zip b/prebuilt/common/bootanimation/vertical-480x854.zip
new file mode 100644
index 00000000..9c2c8b28
Binary files /dev/null and b/prebuilt/common/bootanimation/vertical-480x854.zip differ
diff --git a/prebuilt/common/bootanimation/vertical-540x960.zip b/prebuilt/common/bootanimation/vertical-540x960.zip
new file mode 100644
index 00000000..0f15dbe3
Binary files /dev/null and b/prebuilt/common/bootanimation/vertical-540x960.zip differ
diff --git a/prebuilt/common/bootanimation/vertical-720x1280.zip b/prebuilt/common/bootanimation/vertical-720x1280.zip
new file mode 100644
index 00000000..e5001beb
Binary files /dev/null and b/prebuilt/common/bootanimation/vertical-720x1280.zip differ