diff --git a/klte.mk b/klte.mk
index f37c9e6..70765bd 100644
--- a/klte.mk
+++ b/klte.mk
@@ -124,6 +124,10 @@ PRODUCT_PACKAGES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/thermal-engine-8974.conf:system/etc/thermal-engine-8974.conf
 
+# Widevine
+PRODUCT_PACKAGES += \
+    libshim_wvm
+
 # Wifi
 PRODUCT_PACKAGES += \
     libnetcmdiface \
diff --git a/libshims/Android.mk b/libshims/Android.mk
new file mode 100644
index 0000000..df5427b
--- /dev/null
+++ b/libshims/Android.mk
@@ -0,0 +1,8 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := wvm_shim.cpp
+LOCAL_SHARED_LIBRARIES := libstagefright_foundation
+LOCAL_MODULE := libshim_wvm
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_SHARED_LIBRARY)
diff --git a/libshims/wvm_shim.cpp b/libshims/wvm_shim.cpp
new file mode 100644
index 0000000..ca0376b
--- /dev/null
+++ b/libshims/wvm_shim.cpp
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod 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.
+ */
+
+/* MediaBufferGroup::MediaBufferGroup */
+extern "C" int _ZN7android16MediaBufferGroupC1Ej();
+extern "C" int _ZN7android16MediaBufferGroupC1Ev() {
+    return _ZN7android16MediaBufferGroupC1Ej();
+}
diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc
index 03fb410..67b6168 100644
--- a/rootdir/etc/init.qcom.rc
+++ b/rootdir/etc/init.qcom.rc
@@ -29,7 +29,7 @@ import init.qcom.usb.rc
 import init.target.rc
 
 on early-init
-    export LD_SHIM_LIBS /system/lib/libril.so|libril_shim.so
+    export LD_SHIM_LIBS "/system/lib/libril.so|libril_shim.so:/system/vendor/lib/libwvm.so|libshim_wvm.so"
 
     # Increase max readahead size to 512 KB
     write /sys/block/mmcblk0/queue/read_ahead_kb 512