diff --git a/Android.bp b/Android.bp
index 6c1107f..e4ac86d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1459,6 +1459,87 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libskeymint10device",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libskeymint10device.so",
+            ],
+            shared_libs: [
+                "libshim_crypto",
+                "android.hardware.security.rkp-V3-ndk",
+                "libcrypto-tm",
+                "liblog",
+                "libcutils",
+                "libutils",
+                "libbase",
+                "libhidlbase",
+                "libbinder_ndk",
+                "libskeymint_cli",
+                "libsecril-client",
+                "vendor.samsung.hardware.keymint-V1-ndk_platform",
+                "android.hardware.security.keymint-V4-ndk",
+                "android.hardware.security.sharedsecret-V1-ndk",
+                "android.hardware.security.secureclock-V1-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libskeymint_cli",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libskeymint_cli.so",
+            ],
+            shared_libs: [
+                "libshim_crypto",
+                "android.hardware.security.rkp-V3-ndk",
+                "liblog",
+                "libbase",
+                "libcutils",
+                "libutils",
+                "android.hardware.keymaster@4.0",
+                "android.hardware.keymaster@4.1",
+                "libkeymaster4support",
+                "libkeymaster4_1support",
+                "libhidlbase",
+                "libcrypto-tm",
+                "libbinder_ndk",
+                "libsecril-client",
+                "android.hardware.security.keymint-V4-ndk",
+                "android.hardware.security.sharedsecret-V1-ndk",
+                "android.hardware.security.secureclock-V1-ndk",
+                "libteecl",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libspatializerparamstorage",
     owner: "samsung",
@@ -2419,6 +2500,26 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "android.hardware.security.keymint-service.samsung",
+    owner: "samsung",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    check_elf_files: false,
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    relative_install_path: "hw",
+    soc_specific: true,
+}
+
 sh_binary {
     name: "gps",
     owner: "samsung",
diff --git a/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung b/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung
new file mode 100755
index 0000000..f50d912
Binary files /dev/null and b/proprietary/vendor/bin/hw/android.hardware.security.keymint-service.samsung differ
diff --git a/proprietary/vendor/lib64/libskeymint10device.so b/proprietary/vendor/lib64/libskeymint10device.so
new file mode 100644
index 0000000..1fc1ff6
Binary files /dev/null and b/proprietary/vendor/lib64/libskeymint10device.so differ
diff --git a/proprietary/vendor/lib64/libskeymint_cli.so b/proprietary/vendor/lib64/libskeymint_cli.so
new file mode 100644
index 0000000..d1dd162
Binary files /dev/null and b/proprietary/vendor/lib64/libskeymint_cli.so differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 98a30cc..6382457 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -106,6 +106,8 @@ PRODUCT_PACKAGES += \
     libsehbluetooth_audio_session_aidl \
     libsemnativecarrierfeature \
     libsensorlistener \
+    libskeymint10device \
+    libskeymint_cli \
     libspatializerparamstorage \
     libspeakercalibration \
     libstork_shared \
@@ -144,6 +146,7 @@ PRODUCT_PACKAGES += \
     cass \
     epic \
     android.hardware.drm-service.widevine \
+    android.hardware.security.keymint-service.samsung \
     gps \
     gpsd \
     rild \