diff --git a/target/product/core.mk b/target/product/core.mk
index abb2d9f43..34bad8e17 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -97,7 +97,10 @@ PRODUCT_PACKAGES := \
     libwilhelm \
     libz \
     screencap \
-    sensorservice
+    sensorservice \
+    drmserver \
+    libdrmframework \
+    libdrmframework_jni
 
 # host-only dependencies
 ifeq ($(WITH_HOST_DALVIK),true)
diff --git a/target/product/full_base.mk b/target/product/full_base.mk
index d89af511a..e220778ba 100644
--- a/target/product/full_base.mk
+++ b/target/product/full_base.mk
@@ -20,9 +20,6 @@
 # in inherited configurations.
 
 PRODUCT_PACKAGES := \
-    drmserver \
-    libdrmframework \
-    libdrmframework_jni \
     libfwdlockengine \
     OpenWnn \
     PinyinIME \