--- ./configure.ac.ORIGIN	2017-04-19 15:31:23 -0500
+++ ./configure.ac	2017-04-19 15:38:59 -0500
@@ -790,10 +790,6 @@ case "${target}" in
   mmix-*-*)
     noconfigdirs="$noconfigdirs target-libffi"
     ;;
-  powerpc-*-aix*)
-    # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs target-libffi"
-    ;;
   rs6000-*-aix*)
     noconfigdirs="$noconfigdirs target-libffi"
     ;;
@@ -808,7 +804,7 @@ esac
 # Disable the go frontend on systems where it is known to not work. Please keep
 # this in sync with contrib/config-list.mk.
 case "${target}" in
-*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)
+*-*-darwin* | *-*-cygwin* | *-*-mingw* | rs6000-*-aix*)
     unsupported_languages="$unsupported_languages go"
     ;;
 esac
@@ -824,7 +820,7 @@ if test x$enable_libgo = x; then
     *-*-cygwin* | *-*-mingw*)
 	noconfigdirs="$noconfigdirs target-libgo"
 	;;
-    *-*-aix*)
+    rs6000-*-aix*)
 	noconfigdirs="$noconfigdirs target-libgo"
 	;;
     esac
--- ./contrib/config-list.mk.ORIGIN	2017-04-19 15:39:40 -0500
+++ ./contrib/config-list.mk	2017-04-19 15:42:10 -0500
@@ -121,7 +121,7 @@ $(LIST): make-log-dir
 		TGT=`echo $@ | awk 'BEGIN { FS = "OPT" }; { print $$1 }'` &&			\
 		TGT=`$(GCC_SRC_DIR)/config.sub $$TGT` &&					\
 		case $$TGT in									\
-			*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*)			\
+			*-*-darwin* | *-*-cygwin* | *-*-mingw* | rs6000-*-aix*)			\
 				ADDITIONAL_LANGUAGES="";					\
 				;;								\
 			*)									\