diff --git a/x86/Android.mk b/x86/Android.mk
new file mode 100644
index 0000000..3900ff6
--- /dev/null
+++ b/x86/Android.mk
@@ -0,0 +1,33 @@
+# Copyright (C) 2017 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.
+
+# This file is generated by device/gapps//setup-makefiles.sh
+
+LOCAL_PATH := $(call my-dir)
+
+ifneq ($(filter x86,$(TARGET_ARCH)),)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := PrebuiltGmsCore
+LOCAL_MODULE_OWNER := gapps
+LOCAL_SRC_FILES := proprietary/PrebuiltGmsCore/PrebuiltGmsCore.apk
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := APPS
+LOCAL_DEX_PREOPT := false
+LOCAL_MODULE_SUFFIX := .apk
+LOCAL_PRIVILEGED_MODULE := true
+include $(BUILD_PREBUILT)
+
+endif
diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk
new file mode 100644
index 0000000..af3855b
--- /dev/null
+++ b/x86/BoardConfigVendor.mk
@@ -0,0 +1,16 @@
+# Copyright (C) 2017 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.
+
+# This file is generated by device/gapps//setup-makefiles.sh
+
diff --git a/x86/proprietary/lib/libjni_latinimegoogle.so b/x86/proprietary/lib/libjni_latinimegoogle.so
new file mode 100755
index 0000000..4995579
Binary files /dev/null and b/x86/proprietary/lib/libjni_latinimegoogle.so differ
diff --git a/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk
new file mode 100644
index 0000000..a106040
Binary files /dev/null and b/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ
diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk
new file mode 100644
index 0000000..9e6fc13
--- /dev/null
+++ b/x86/x86-vendor.mk
@@ -0,0 +1,23 @@
+# Copyright (C) 2017 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.
+
+# This file is generated by device/gapps//setup-makefiles.sh
+
+PRODUCT_COPY_FILES += \
+    vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so
+
+PRODUCT_PACKAGES += \
+    PrebuiltGmsCore
+
+$(call inherit-product, vendor/gapps/common/common-vendor.mk)