diff --git a/LICENSE b/LICENSE
index bc9bf9d..3820978 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-For files in [arm/arm64/common/x86]/proprietary:
+For files in [arm/arm64/common/x86/x86_64]/proprietary:
     These are closed source/propietary/prebuilt files.
     I do not own them, these are just here to make
     your life easier when compiling the package.
diff --git a/README.md b/README.md
index 98c390f..14ee151 100644
--- a/README.md
+++ b/README.md
@@ -19,10 +19,13 @@ _make gapps_arm64_
 _make gapps_x86_
 - compile signed flashable GApps for x86
 
+_make gapps_x86_64_
+- compile signed flashable GApps for x86_64
+
 Build inline with Android
 -------------------
 1. Sync this repo to $GAPPS_PATH where $GAPPS_PATH is the path to this repo
-2. Include $GAPPS_PATH/$ARCH/$ARCH-vendor.mk where $ARCH is arm, arm64, or x86 depending on the device's architecture
+2. Include $GAPPS_PATH/$ARCH/$ARCH-vendor.mk where $ARCH is arm, arm64, x86, or x86_64 depending on the device's architecture
 
 Explanation of pinned blobs
 -------------------
diff --git a/build/main.mk b/build/main.mk
index 598f3b0..441f290 100644
--- a/build/main.mk
+++ b/build/main.mk
@@ -20,3 +20,7 @@ gapps_arm64:
 gapps_x86:
 	@echo "Compiling GApps for x86..."
 	@bash $(BUILD_GAPPS) x86 2>&1
+
+gapps_x86_64:
+	@echo "Compiling GApps for x86_64..."
+	@bash $(BUILD_GAPPS) x86_64 2>&1
diff --git a/common/Android.mk b/common/Android.mk
index 060670c..d33e589 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -4,6 +4,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),)
+ifneq ($(filter arm arm64 x86 x86_64,$(TARGET_ARCH)),)
 
 endif
diff --git a/proprietary-files-x86_64-nongrouper.txt b/proprietary-files-x86_64-nongrouper.txt
new file mode 100644
index 0000000..bbb8f53
--- /dev/null
+++ b/proprietary-files-x86_64-nongrouper.txt
@@ -0,0 +1,2 @@
+-product/priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|cae5849fdd55cf7ef4a7fde1a180ab8fb2cf8dfd
+-product/priv-app/Velvet/Velvet.apk;PRESIGNED|131f57f1c772e1c08078e161e6ba5a7f79ed022f
diff --git a/proprietary-files-x86_64.txt b/proprietary-files-x86_64.txt
new file mode 100644
index 0000000..de571fb
--- /dev/null
+++ b/proprietary-files-x86_64.txt
@@ -0,0 +1,4 @@
+-product/priv-app/GmsCore/GmsCore.apk;PRESIGNED|3e73cf0f39fc502f1af48e327c335ff62f7f663c
+-product/priv-app/Phonesky/Phonesky.apk;PRESIGNED|71fbadef425a5dcbda3d2c2264d0b28cabbeb2f9
+product/lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79
+product/lib64/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 2cb7d93..a9ba31f 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -38,7 +38,7 @@ fi
 setup_vendor "$DEVICE_COMMON" "$VENDOR" "$ANDROID_ROOT" true
 
 # Copyright headers
-write_headers "arm arm64 x86"
+write_headers "arm arm64 x86 x86_64"
 
 # Common gapps
 write_makefiles "$MY_DIR"/proprietary-files-common.txt
@@ -54,7 +54,7 @@ sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK"
 # We are done with common
 write_footers
 
-for DEVICE in arm arm64 x86; do
+for DEVICE in arm arm64 x86 x86_64; do
 
 # Reinitialize the helper for target gapps
 setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT"
diff --git a/x86_64/Android.bp b/x86_64/Android.bp
new file mode 100644
index 0000000..83dc8c7
--- /dev/null
+++ b/x86_64/Android.bp
@@ -0,0 +1,56 @@
+// Automatically generated file. DO NOT MODIFY
+//
+// This file is generated by device/gapps/x86_64/setup-makefiles.sh
+
+soong_namespace {
+}
+
+android_app_import {
+	name: "GmsCore",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/GmsCore/GmsCore.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "Phonesky",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "SetupWizard",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/SetupWizard/SetupWizard.apk",
+	overrides: ["Provision"],
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
+android_app_import {
+	name: "Velvet",
+	owner: "gapps",
+	apk: "proprietary/product/priv-app/Velvet/Velvet.apk",
+	presigned: true,
+	dex_preopt: {
+		enabled: false,
+	},
+	privileged: true,
+	product_specific: true,
+}
+
diff --git a/x86_64/Android.mk b/x86_64/Android.mk
new file mode 100644
index 0000000..cca6c3f
--- /dev/null
+++ b/x86_64/Android.mk
@@ -0,0 +1,9 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/gapps/x86_64/setup-makefiles.sh
+
+LOCAL_PATH := $(call my-dir)
+
+ifeq ($(TARGET_ARCH),x86_64)
+
+endif
diff --git a/x86_64/BoardConfigVendor.mk b/x86_64/BoardConfigVendor.mk
new file mode 100644
index 0000000..4412af9
--- /dev/null
+++ b/x86_64/BoardConfigVendor.mk
@@ -0,0 +1,4 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/gapps/x86_64/setup-makefiles.sh
+
diff --git a/x86_64/x86_64-vendor.mk b/x86_64/x86_64-vendor.mk
new file mode 100644
index 0000000..2e41387
--- /dev/null
+++ b/x86_64/x86_64-vendor.mk
@@ -0,0 +1,23 @@
+# Automatically generated file. DO NOT MODIFY
+#
+# This file is generated by device/gapps/x86_64/setup-makefiles.sh
+
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/gapps/x86_64
+
+PRODUCT_COPY_FILES += \
+    vendor/gapps/x86_64/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so \
+    vendor/gapps/x86_64/proprietary/product/lib64/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libjni_latinimegoogle.so
+
+PRODUCT_PACKAGES += \
+    GmsCore \
+    Phonesky
+
+ifeq ($(TARGET_IS_GROUPER),)
+
+PRODUCT_PACKAGES += \
+    SetupWizard \
+    Velvet
+endif
+
+$(call inherit-product, vendor/gapps/common/common-vendor.mk)