diff --git a/baseconfig/powerpc/CONFIG_SWIOTLB b/baseconfig/powerpc/CONFIG_SWIOTLB
index 5405b65b4..ac62bf35e 100644
--- a/baseconfig/powerpc/CONFIG_SWIOTLB
+++ b/baseconfig/powerpc/CONFIG_SWIOTLB
@@ -1 +1 @@
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index dbbef398a..c17813d6b 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -4966,7 +4966,7 @@ CONFIG_SURFACE3_WMI=m
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
 CONFIG_SYNC_FILE=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index b9e46b29c..d368edd1f 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -4942,7 +4942,7 @@ CONFIG_SURFACE3_WMI=m
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
 CONFIG_SYNC_FILE=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2300ca5d2..c76b90fb2 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4895,7 +4895,7 @@ CONFIG_SURFACE3_WMI=m
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
 CONFIG_SYNC_FILE=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index e4d75424a..de68e7c9d 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4871,7 +4871,7 @@ CONFIG_SURFACE3_WMI=m
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
 CONFIG_SYNC_FILE=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index ff0fa81e5..0ae90d5fe 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -4894,7 +4894,7 @@ CONFIG_SURFACE3_WMI=m
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
 CONFIG_SYNC_FILE=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 362af9009..0c2a27ff0 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -4870,7 +4870,7 @@ CONFIG_SURFACE3_WMI=m
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
+# CONFIG_SWIOTLB is not set
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
 CONFIG_SYNC_FILE=y
diff --git a/kernel.spec b/kernel.spec
index 701cc798b..7c2d47179 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2196,6 +2196,9 @@ fi
 #
 #
 %changelog
+* Fri Aug 11 2017 Dan Horak <dan@danny.cz>
+- disable SWIOTLB on Power (#1480380)
+
 * Fri Aug 11 2017 Josh Boyer <jwboyer@fedoraproject.org>
 - Disable MEMORY_HOTPLUG_DEFAULT_ONLINE on ppc64 (rhbz 1476380)