diff --git a/baseconfig/arm/CONFIG_MESON_SM b/baseconfig/arm/CONFIG_MESON_SM
index 3cd5a9e30..e918e3e03 100644
--- a/baseconfig/arm/CONFIG_MESON_SM
+++ b/baseconfig/arm/CONFIG_MESON_SM
@@ -1 +1 @@
-CONFIG_MESON_SM=y
+# CONFIG_MESON_SM is not set
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES b/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES
new file mode 100644
index 000000000..5df91df1a
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_ARM64_4K_PAGES
@@ -0,0 +1 @@
+CONFIG_ARM64_4K_PAGES=y
diff --git a/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES b/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES
deleted file mode 100644
index bda5426de..000000000
--- a/baseconfig/arm/arm64/CONFIG_ARM64_64K_PAGES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM64_64K_PAGES=y
diff --git a/baseconfig/arm/arm64/CONFIG_COMPAT b/baseconfig/arm/arm64/CONFIG_COMPAT
new file mode 100644
index 000000000..3e041f1b6
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_COMPAT
@@ -0,0 +1 @@
+# CONFIG_COMPAT is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 42967737a..2e45e76d7 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -237,7 +237,7 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCNET is not set
-CONFIG_ARM64_64K_PAGES=y
+CONFIG_ARM64_4K_PAGES=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_ARM64_ERRATUM_819472=y
@@ -879,6 +879,7 @@ CONFIG_COMMON_CLK=y
 CONFIG_COMMON_RESET_HI6220=m
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
+# CONFIG_COMPAT is not set
 # CONFIG_COMPILE_TEST is not set
 CONFIG_CONFIGFS_FS=y
 CONFIG_CONNECTOR=y
@@ -2831,7 +2832,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_GXL_PHY=m
-CONFIG_MESON_SM=y
+# CONFIG_MESON_SM is not set
 # CONFIG_MESON_WATCHDOG is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 86cb4c02c..12f1fb7cd 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -237,7 +237,7 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_ZX is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCNET is not set
-CONFIG_ARM64_64K_PAGES=y
+CONFIG_ARM64_4K_PAGES=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_CRYPTO=y
 CONFIG_ARM64_ERRATUM_819472=y
@@ -879,6 +879,7 @@ CONFIG_COMMON_CLK=y
 CONFIG_COMMON_RESET_HI6220=m
 CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
+# CONFIG_COMPAT is not set
 # CONFIG_COMPILE_TEST is not set
 CONFIG_CONFIGFS_FS=y
 CONFIG_CONNECTOR=y
@@ -2811,7 +2812,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_GXL_PHY=m
-CONFIG_MESON_SM=y
+# CONFIG_MESON_SM is not set
 # CONFIG_MESON_WATCHDOG is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 7a60d3d39..2651a8b9a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3049,7 +3049,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 # CONFIG_MESON_GXL_PHY is not set
-CONFIG_MESON_SM=y
+# CONFIG_MESON_SM is not set
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_MFD_88PM800=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 61875ddcb..53591551c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2916,7 +2916,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 # CONFIG_MESON_GXL_PHY is not set
-CONFIG_MESON_SM=y
+# CONFIG_MESON_SM is not set
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 7c84a17e6..6db332c31 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2896,7 +2896,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 # CONFIG_MESON_GXL_PHY is not set
-CONFIG_MESON_SM=y
+# CONFIG_MESON_SM is not set
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5aa8b2698..69d2e09d6 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3029,7 +3029,7 @@ CONFIG_MEMSTICK_TIFM_MS=m
 CONFIG_MESON_EFUSE=m
 # CONFIG_MESON_GXBB_WATCHDOG is not set
 # CONFIG_MESON_GXL_PHY is not set
-CONFIG_MESON_SM=y
+# CONFIG_MESON_SM is not set
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 CONFIG_MFD_88PM800=m
diff --git a/kernel.spec b/kernel.spec
index 5face3693..458784fb6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2171,6 +2171,7 @@ fi
 %changelog
 * Mon Apr 03 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc5.git0.1
 - Linux v4.11-rc5
+- Disable 64K pages on aarch64
 
 * Mon Apr 03 2017 Laura Abbott <labbott@fedoraproject.org>
 - Disable debugging options.