diff --git a/Makefile.in b/Makefile.in
index c73a9e0d12154df308c3149af716906d8336f875..850d391fda42d5c85df4d75e77b98d9a018c8df1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -615,7 +615,8 @@ distdir: $(DISTFILES)
 	done
 	set -e; for d in sparc32 sparc64 x86 \
 		x86_64 x86_64/aesni x86_64/sha_ni x86_64/fat \
-		arm arm/neon arm/v6 arm/fat ; do \
+		arm arm/neon arm/v6 arm/fat \
+		powerpc64 powerpc64/P8 powerpc64/fat ; do \
 	  mkdir "$(distdir)/$$d" ; \
 	  find "$(srcdir)/$$d" -maxdepth 1 '(' -name '*.asm' -o -name '*.m4' ')' \
 	    -exec cp '{}' "$(distdir)/$$d" ';' ; \
diff --git a/configure.ac b/configure.ac
index d8b7b07215003fbb766b2d6430e53281eded88a2..98b4cf3d5457001bfe0fe9063b61d9efb070c0fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,12 @@ AC_ARG_ENABLE(x86-sha-ni,
   AC_HELP_STRING([--enable-x86-sha-ni], [Enable x86_64 sha_ni instructions. (default=no)]),,
   [enable_x86_sha_ni=no])
 
+# Default yes for initial testing
+AC_ARG_ENABLE(power-crypto-ext,
+  AC_HELP_STRING([--enable-power-crypto-ext], [Enable POWER crypto
+extensions. (default=yes)]),,
+  [enable_power_crypto_ext=yes])
+
 AC_ARG_ENABLE(mini-gmp,
   AC_HELP_STRING([--enable-mini-gmp], [Enable mini-gmp, used instead of libgmp.]),,
   [enable_mini_gmp=no])
@@ -439,6 +445,12 @@ if test "x$enable_assembler" = xyes ; then
 	fi
       fi
       ;;
+    *powerpc64*)
+      if test "x$enable_power_crypto_ext" = xyes ; then
+        asm_path="powerpc64/P8 powerpc64"
+      fi
+      ;;
+
     *)
       enable_assembler=no
       ;;