diff --git a/core/user_tags.mk b/core/user_tags.mk
index 53f0ee2..325c600 100644
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -164,7 +164,6 @@
 	jsr305lib \
 	junit \
 	jython \
-	keystore \
 	kxml2-2.3.0 \
 	launch-wrapper \
 	layoutlib \
diff --git a/target/product/core.mk b/target/product/core.mk
index 8f6b0e7..38a5a6c 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -66,6 +66,8 @@
     ip-up-vpn \
     ip6tables \
     iptables \
+    keystore \
+    keystore.default \
     libandroidfw \
     libOpenMAXAL \
     libOpenSLES \
@@ -79,6 +81,7 @@
     libgabi++ \
     libicui18n \
     libicuuc \
+    libkeystore \
     libnativehelper \
     libnfc_ndef \
     libpowermanager \