diff --git a/prebuilt/passion/media/audio/ui/Dock.ogg b/prebuilt/passion/media/audio/ui/Dock.ogg
deleted file mode 100644
index 1462813d..00000000
Binary files a/prebuilt/passion/media/audio/ui/Dock.ogg and /dev/null differ
diff --git a/prebuilt/passion/media/audio/ui/Lock.ogg b/prebuilt/passion/media/audio/ui/Lock.ogg
deleted file mode 100644
index e7928e49..00000000
Binary files a/prebuilt/passion/media/audio/ui/Lock.ogg and /dev/null differ
diff --git a/prebuilt/passion/media/audio/ui/LowBattery.ogg b/prebuilt/passion/media/audio/ui/LowBattery.ogg
deleted file mode 100644
index 68eb2c31..00000000
Binary files a/prebuilt/passion/media/audio/ui/LowBattery.ogg and /dev/null differ
diff --git a/prebuilt/passion/media/audio/ui/Undock.ogg b/prebuilt/passion/media/audio/ui/Undock.ogg
deleted file mode 100644
index 00530667..00000000
Binary files a/prebuilt/passion/media/audio/ui/Undock.ogg and /dev/null differ
diff --git a/prebuilt/passion/media/audio/ui/Unlock.ogg b/prebuilt/passion/media/audio/ui/Unlock.ogg
deleted file mode 100644
index cca95940..00000000
Binary files a/prebuilt/passion/media/audio/ui/Unlock.ogg and /dev/null differ
diff --git a/products/common.mk b/products/common.mk
index 51808578..2ae3fe57 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -23,6 +23,9 @@ PRODUCT_COPY_FILES += \
 # Allow the use of overlays
 PRODUCT_PACKAGE_OVERLAYS := vendor/cyanogen/overlay
 
+# Bring in some audio files
+include frameworks/base/data/sounds/AudioPackage4.mk
+
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/lib/libncurses.so:system/lib/libncurses.so \
     vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
@@ -83,9 +86,9 @@ ifdef CYANOGEN_WITH_GOOGLE
         vendor/cyanogen/proprietary/com.google.android.maps.jar:./system/framework/com.google.android.maps.jar \
         vendor/cyanogen/proprietary/libinterstitial.so:./system/lib/libinterstitial.so \
         vendor/cyanogen/proprietary/libspeech.so:./system/lib/libspeech.so
-else    
+else
     PRODUCT_PACKAGES += \
         Provision \
         GoogleSearch \
         LatinIME
-endif
\ No newline at end of file
+endif
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 115e8d7d..8b6d8228 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -30,9 +30,4 @@ endif
 # Copy passion specific prebuilt files
 #
 PRODUCT_COPY_FILES +=  \
-    vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip \
-    vendor/cyanogen/prebuilt/passion/media/audio/ui/Dock.ogg:system/media/audio/ui/Dock.ogg \
-    vendor/cyanogen/prebuilt/passion/media/audio/ui/Lock.ogg:system/media/audio/ui/Lock.ogg \
-    vendor/cyanogen/prebuilt/passion/media/audio/ui/LowBattery.ogg:system/media/audio/ui/LowBattery.ogg \
-    vendor/cyanogen/prebuilt/passion/media/audio/ui/Undock.ogg:system/media/audio/ui/Undock.ogg \
-    vendor/cyanogen/prebuilt/passion/media/audio/ui/Unlock.ogg:system/media/audio/ui/Unlock.ogg 
+    vendor/cyanogen/prebuilt/passion/media/bootanimation.zip:system/media/bootanimation.zip