diff --git a/self-extractors/generate-packages.sh b/self-extractors/generate-packages.sh
index 80ce27e..ce5f1b6 100755
--- a/self-extractors/generate-packages.sh
+++ b/self-extractors/generate-packages.sh
@@ -34,7 +34,7 @@
 DEVICE=stingray
 MANUFACTURER=moto
 
-for COMPANY in nvidia broadcom
+for COMPANY in nvidia broadcom moto
 do
   echo Processing files from $COMPANY
   rm -rf tmp
@@ -49,6 +49,11 @@
             system/vendor/firmware/fw_bcm4329_mfg.bin
             "
     ;;
+  moto)
+    TO_EXTRACT="\
+            system/lib/hw/camera.stingray.so
+            "
+    ;;
   nvidia)
     TO_EXTRACT="\
             system/etc/firmware/nvmm_aacdec.axf \
@@ -69,8 +74,11 @@
             system/etc/firmware/nvmm_sw_mp3dec.axf \
             system/etc/firmware/nvmm_wavdec.axf \
             system/etc/firmware/nvrm_avp.bin \
+            system/lib/egl/libEGL_perfhud.so \
             system/lib/egl/libEGL_tegra.so \
+            system/lib/egl/libGLESv1_CM_perfhud.so \
             system/lib/egl/libGLESv1_CM_tegra.so \
+            system/lib/egl/libGLESv2_perfhud.so \
             system/lib/egl/libGLESv2_tegra.so \
             system/lib/hw/gralloc.tegra.so \
             system/lib/hw/hwcomposer.tegra.so \
@@ -89,6 +97,8 @@
             system/lib/libnvmm_tracklist.so \
             system/lib/libnvmm_utils.so \
             system/lib/libnvmm_video.so \
+            system/lib/libnvodm_imager.so \
+            system/lib/libnvodm_query.so \
             system/lib/libnvomx.so \
             system/lib/libnvomxilclient.so \
             system/lib/libnvos.so \
diff --git a/self-extractors/moto/COPYRIGHT b/self-extractors/moto/COPYRIGHT
new file mode 100644
index 0000000..abd2ffd
--- /dev/null
+++ b/self-extractors/moto/COPYRIGHT
@@ -0,0 +1 @@
+# (C) Motorola - All Rights Reserved
diff --git a/self-extractors/moto/LICENSE b/self-extractors/moto/LICENSE
new file mode 100644
index 0000000..9a204a6
--- /dev/null
+++ b/self-extractors/moto/LICENSE
@@ -0,0 +1 @@
+MOTOROLA LICENSE GOES HERE
diff --git a/self-extractors/moto/staging/BoardConfigStingray.mk b/self-extractors/moto/staging/BoardConfigStingray.mk
new file mode 100644
index 0000000..851a7a8
--- /dev/null
+++ b/self-extractors/moto/staging/BoardConfigStingray.mk
@@ -0,0 +1,13 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
diff --git a/self-extractors/moto/staging/device-stingray.mk b/self-extractors/moto/staging/device-stingray.mk
new file mode 100644
index 0000000..391df2b
--- /dev/null
+++ b/self-extractors/moto/staging/device-stingray.mk
@@ -0,0 +1,19 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+LOCAL_PATH := vendor/moto/stingray
+
+# Motorola blob necessary for stingray hardware
+PRODUCT_COPY_FILES := \
+    $(LOCAL_PATH)/proprietary/camera.stingray.so:system/lib/hw/camera.stingray.so
diff --git a/self-extractors/nvidia/staging/device-stingray.mk b/self-extractors/nvidia/staging/device-stingray.mk
index 9ec9110..f4ab4a1 100644
--- a/self-extractors/nvidia/staging/device-stingray.mk
+++ b/self-extractors/nvidia/staging/device-stingray.mk
@@ -34,8 +34,11 @@
     $(LOCAL_PATH)/proprietary/nvmm_sw_mp3dec.axf:system/etc/firmware/nvmm_sw_mp3dec.axf \
     $(LOCAL_PATH)/proprietary/nvmm_wavdec.axf:system/etc/firmware/nvmm_wavdec.axf \
     $(LOCAL_PATH)/proprietary/nvrm_avp.bin:system/etc/firmware/nvrm_avp.bin \
+    $(LOCAL_PATH)/proprietary/libEGL_perfhud.so:system/lib/egl/libEGL_perfhud.so \
     $(LOCAL_PATH)/proprietary/libEGL_tegra.so:system/lib/egl/libEGL_tegra.so \
+    $(LOCAL_PATH)/proprietary/libGLESv1_CM_perfhud.so:system/lib/egl/libGLESv1_CM_perfhud.so \
     $(LOCAL_PATH)/proprietary/libGLESv1_CM_tegra.so:system/lib/egl/libGLESv1_CM_tegra.so \
+    $(LOCAL_PATH)/proprietary/libGLESv2_perfhud.so:system/lib/egl/libGLESv2_perfhud.so \
     $(LOCAL_PATH)/proprietary/libGLESv2_tegra.so:system/lib/egl/libGLESv2_tegra.so \
     $(LOCAL_PATH)/proprietary/gralloc.tegra.so:system/lib/hw/gralloc.tegra.so \
     $(LOCAL_PATH)/proprietary/hwcomposer.tegra.so:system/lib/hw/hwcomposer.tegra.so \
@@ -54,6 +57,8 @@
     $(LOCAL_PATH)/proprietary/libnvmm_tracklist.so:system/lib/libnvmm_tracklist.so \
     $(LOCAL_PATH)/proprietary/libnvmm_utils.so:system/lib/libnvmm_utils.so \
     $(LOCAL_PATH)/proprietary/libnvmm_video.so:system/lib/libnvmm_video.so \
+    $(LOCAL_PATH)/proprietary/libnvodm_imager.so:system/lib/libnvodm_imager.so \
+    $(LOCAL_PATH)/proprietary/libnvodm_query.so:system/lib/libnvodm_query.so \
     $(LOCAL_PATH)/proprietary/libnvomx.so:system/lib/libnvomx.so \
     $(LOCAL_PATH)/proprietary/libnvomxilclient.so:system/lib/libnvomxilclient.so \
     $(LOCAL_PATH)/proprietary/libnvos.so:system/lib/libnvos.so \
diff --git a/self-extractors/root/BoardConfigVendor.mk b/self-extractors/root/BoardConfigVendor.mk
index 859309c..30ea89d 100644
--- a/self-extractors/root/BoardConfigVendor.mk
+++ b/self-extractors/root/BoardConfigVendor.mk
@@ -15,4 +15,5 @@
 LOCAL_STEM := stingray/BoardConfigStingray.mk
 
 -include vendor/broadcom/$(LOCAL_STEM)
+-include vendor/moto/$(LOCAL_STEM)
 -include vendor/nvidia/$(LOCAL_STEM)
diff --git a/self-extractors/root/stingray-vendor.mk b/self-extractors/root/stingray-vendor.mk
index 665c02e..d7a57bf 100644
--- a/self-extractors/root/stingray-vendor.mk
+++ b/self-extractors/root/stingray-vendor.mk
@@ -15,4 +15,5 @@
 LOCAL_STEM := stingray/device-stingray.mk
 
 $(call inherit-product-if-exists, vendor/broadcom/$(LOCAL_STEM))
+$(call inherit-product-if-exists, vendor/moto/$(LOCAL_STEM))
 $(call inherit-product-if-exists, vendor/nvidia/$(LOCAL_STEM))