diff --git a/config-arm64 b/config-arm64
index 3ef1adb81..38b16dbab 100644
--- a/config-arm64
+++ b/config-arm64
@@ -150,7 +150,7 @@ CONFIG_PCI_XGENE_MSI=y
 CONFIG_I2C_XGENE_SLIMPRO=m
 CONFIG_XGENE_SLIMPRO_MBOX=m
 CONFIG_MDIO_XGENE=m
-# CONFIG_SENSORS_XGENE is not set
+CONFIG_SENSORS_XGENE=m
 CONFIG_XGENE_PMU=y
 
 # AMD Seattle
@@ -289,9 +289,9 @@ CONFIG_THUNDER_NIC_VF=m
 CONFIG_THUNDER_NIC_BGX=m
 CONFIG_THUNDER_NIC_RGX=m
 # CONFIG_LIQUIDIO is not set
-# CONFIG_SPI_THUNDERX is not set
-# CONFIG_I2C_THUNDERX is not set
-# CONFIG_HW_RANDOM_CAVIUM is not set
+CONFIG_SPI_THUNDERX=m
+CONFIG_I2C_THUNDERX=m
+CONFIG_HW_RANDOM_CAVIUM=m
 
 CONFIG_SATA_AHCI_PLATFORM=y
 CONFIG_SATA_AHCI_SEATTLE=m
diff --git a/config-generic b/config-generic
index 9408308cf..ac1a28347 100644
--- a/config-generic
+++ b/config-generic
@@ -5124,7 +5124,7 @@ CONFIG_CRYPTO_ANSI_CPRNG=m
 # CONFIG_CRYPTO_DRBG_MENU is not set
 CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-# CONFIG_CRYPTO_DEV_CHELSIO is not set
+CONFIG_CRYPTO_DEV_CHELSIO=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_USER=m
 CONFIG_CRYPTO_RSA=m
diff --git a/kernel.spec b/kernel.spec
index d4de3f594..4894491d0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2155,6 +2155,9 @@ fi
 #
 #
 %changelog
+* Wed Oct 12 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Adjust aarch64 config options
+
 * Tue Oct 11 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git6.2
 - Revert possible commits causing perf build failures