diff --git a/hidl/keymaster/.clang-format b/hidl/keymaster/.clang-format
new file mode 100644
index 0000000..ae4a451
--- /dev/null
+++ b/hidl/keymaster/.clang-format
@@ -0,0 +1,11 @@
+BasedOnStyle: Google
+AccessModifierOffset: -2
+AllowShortFunctionsOnASingleLine: Inline
+ColumnLimit: 100
+CommentPragmas: NOLINT:.*
+DerivePointerAlignment: false
+IndentWidth: 4
+PointerAlignment: Left
+TabWidth: 4
+UseTab: Never
+PenaltyExcessCharacter: 32
diff --git a/hidl/keymaster/Android.mk b/hidl/keymaster/Android.mk
new file mode 100644
index 0000000..0aaa7cd
--- /dev/null
+++ b/hidl/keymaster/Android.mk
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2019 The LineageOS 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.
+#
+
+ifeq ($(TARGET_KEYMASTER_VARIANT),samsung)
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+    service.cpp
+
+LOCAL_SHARED_LIBRARIES := \
+    android.hardware.keymaster@4.0 \
+    libbase \
+    libcutils \
+    libhardware \
+    libhidlbase \
+    libhidltransport \
+    libkeymaster4 \
+    liblog \
+    libskeymaster4device \
+    libutils
+
+LOCAL_MODULE := android.hardware.keymaster@4.0-service.samsung
+LOCAL_INIT_RC := android.hardware.keymaster@4.0-service.samsung.rc
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_OWNER := samsung
+LOCAL_VENDOR_MODULE := true
+
+include $(BUILD_EXECUTABLE)
+
+endif # TARGET_KEYMASTER_VARIANT
diff --git a/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc b/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
new file mode 100644
index 0000000..b84165f
--- /dev/null
+++ b/hidl/keymaster/android.hardware.keymaster@4.0-service.samsung.rc
@@ -0,0 +1,8 @@
+service vendor.keymaster-4-0 /vendor/bin/hw/android.hardware.keymaster@4.0-service.samsung
+    class early_hal
+    user system
+    group system drmrpc
+
+on post-fs-data
+    mkdir /mnt/vendor/efs/DAK 0775 system system
+    restorecon -R /mnt/vendor/efs/DAK
diff --git a/hidl/keymaster/service.cpp b/hidl/keymaster/service.cpp
new file mode 100644
index 0000000..7086273
--- /dev/null
+++ b/hidl/keymaster/service.cpp
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2019 The LineageOS 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.
+ */
+
+#define LOG_TAG "android.hardware.keymaster@4.0-service.samsung"
+
+#include <android-base/logging.h>
+#include <android/hardware/keymaster/4.0/IKeymasterDevice.h>
+#include <hidl/HidlTransportSupport.h>
+
+#include <AndroidKeymaster4Device.h>
+
+using android::hardware::configureRpcThreadpool;
+using android::hardware::joinRpcThreadpool;
+
+using android::hardware::keymaster::V4_0::IKeymasterDevice;
+using android::hardware::keymaster::V4_0::SecurityLevel;
+
+using android::OK;
+using android::status_t;
+
+namespace skeymaster {
+IKeymasterDevice* CreateSKeymasterDevice(SecurityLevel securityLevel);
+}  // namespace skeymaster
+
+int main() {
+    IKeymasterDevice* keymaster =
+        skeymaster::CreateSKeymasterDevice(SecurityLevel::TRUSTED_ENVIRONMENT);
+
+    configureRpcThreadpool(1, true);
+
+    status_t status = keymaster->registerAsService();
+
+    if (status != OK) {
+        LOG(ERROR) << "Could not register service for Keymaster HAL";
+        goto shutdown;
+    }
+
+    LOG(INFO) << "Keymaster HAL service is Ready.";
+    joinRpcThreadpool();
+
+shutdown:
+    // In normal operation, we don't expect the thread pool to shutdown
+    LOG(ERROR) << "Keymaster HAL failed to join thread pool.";
+    return -1;
+}