diff --git a/configure b/configure
index 8f71422920dfedefa424163cef5da7eac1f72d23..9a120bc300fccbcd5c6ef25c8da7658aa1d34b65 100755
--- a/configure
+++ b/configure
@@ -795,7 +795,7 @@ ARCH_LIST='
     m68k
     mips
     parisc
-    powerpc
+    ppc
     s390
     sh4
     sparc
@@ -932,7 +932,7 @@ CMDLINE_SET="
 # code dependency declarations
 
 # architecture extensions
-altivec_deps="powerpc"
+altivec_deps="ppc"
 armv5te_deps="arm"
 armv6_deps="arm"
 armvfp_deps="arm"
@@ -1317,11 +1317,11 @@ EOF
         enable fast_64bit
     ;;
     "Power Macintosh"|ppc|powerpc)
-        arch="powerpc"
+        arch="ppc"
         enable fast_unaligned
     ;;
     ppc64)
-        arch="powerpc"
+        arch="ppc"
         enable fast_64bit
         enable fast_unaligned
     ;;
@@ -1754,7 +1754,7 @@ fi
 
 # check for assembler specific support
 
-if test $arch = "powerpc"; then
+if test $arch = "ppc"; then
     check_asm dcbzl '"dcbzl 0, 1"'
 fi
 
@@ -2145,7 +2145,7 @@ fi
 if test $arch = "mips"; then
     echo "MMI enabled               ${mmi-no}"
 fi
-if test $arch = "powerpc"; then
+if test $arch = "ppc"; then
     echo "AltiVec enabled           ${altivec-no}"
     echo "dcbzl available           ${dcbzl-no}"
 fi
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index aaeb9a40f4f35d43abd936f65f6618e9565303a2..ca94d169e9d396fac862862a8c0fdd159c54085d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -463,7 +463,7 @@ OBJS-$(ARCH_BFIN)                      += bfin/dsputil_bfin.o           \
                                           bfin/vp3_bfin.o               \
                                           bfin/vp3_idct_bfin.o          \
 
-OBJS-$(ARCH_POWERPC)                   += ppc/dsputil_ppc.o             \
+OBJS-$(ARCH_PPC)                       += ppc/dsputil_ppc.o             \
 
 ALTIVEC-OBJS-$(CONFIG_H264_DECODER)    += ppc/h264_altivec.o
 ALTIVEC-OBJS-$(CONFIG_OLDSCALER)       += ppc/imgresample_altivec.o
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 78942775e4acf37022eb062ebff9c351f3c4fd71..76f5dbbf4de93896684fde9c6519a2a62c8e59d0 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -169,7 +169,7 @@ void ff_init_scantable(uint8_t *permutation, ScanTable *st, const uint8_t *src_s
         int j;
         j = src_scantable[i];
         st->permutated[i] = permutation[j];
-#ifdef ARCH_POWERPC
+#ifdef ARCH_PPC
         st->inverse[j] = i;
 #endif
     }
@@ -4628,7 +4628,7 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx)
     if (ENABLE_MLIB)     dsputil_init_mlib  (c, avctx);
     if (ENABLE_VIS)      dsputil_init_vis   (c, avctx);
     if (ENABLE_ALPHA)    dsputil_init_alpha (c, avctx);
-    if (ENABLE_POWERPC)  dsputil_init_ppc   (c, avctx);
+    if (ENABLE_PPC)      dsputil_init_ppc   (c, avctx);
     if (ENABLE_MMI)      dsputil_init_mmi   (c, avctx);
     if (ENABLE_SH4)      dsputil_init_sh4   (c, avctx);
     if (ENABLE_BFIN)     dsputil_init_bfin  (c, avctx);
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 5beda8b42382e5adb973baa381c097026f8a8122..88ed315e6af7ab9faf7064f2be12f6d770f4136d 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -173,7 +173,7 @@ typedef struct ScanTable{
     const uint8_t *scantable;
     uint8_t permutated[64];
     uint8_t raster_end[64];
-#ifdef ARCH_POWERPC
+#ifdef ARCH_PPC
                 /** Used by dct_quantize_altivec to find last-non-zero */
     DECLARE_ALIGNED(16, uint8_t, inverse[64]);
 #endif
@@ -616,7 +616,7 @@ extern int mm_flags;
 #   define STRIDE_ALIGN 16
 #endif
 
-#elif defined(ARCH_POWERPC)
+#elif defined(ARCH_PPC)
 
 extern int mm_flags;
 
diff --git a/libavcodec/libxvidff.c b/libavcodec/libxvidff.c
index 5e1934c455e6de79235aa7bfbb535cce98b6272d..314945961bc851e07005fa7a735981a1fcbf9d04 100644
--- a/libavcodec/libxvidff.c
+++ b/libavcodec/libxvidff.c
@@ -166,7 +166,7 @@ av_cold int ff_xvid_encode_init(AVCodecContext *avctx)  {
     xvid_gbl_init.version = XVID_VERSION;
     xvid_gbl_init.debug = 0;
 
-#ifdef ARCH_POWERPC
+#ifdef ARCH_PPC
     /* Xvid's PPC support is borked, use libavcodec to detect */
 #ifdef HAVE_ALTIVEC
     if( has_altivec() ) {
diff --git a/libavcodec/mathops.h b/libavcodec/mathops.h
index 26405dd6f1696347797c7b983b6b1683b268a697..07265c81f5837fdd7d3eeb5f7ea369e93b349779 100644
--- a/libavcodec/mathops.h
+++ b/libavcodec/mathops.h
@@ -32,7 +32,7 @@
 
 #include "arm/mathops.h"
 
-#elif defined(ARCH_POWERPC)
+#elif defined(ARCH_PPC)
 
 #include "ppc/mathops.h"
 
diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h
index 776ee62eca19d1f50527894f577802f90240f991..edfe2ea2422cbc275f4f42512f79522b4cd6517a 100644
--- a/libavcodec/ppc/mathops.h
+++ b/libavcodec/ppc/mathops.h
@@ -23,7 +23,7 @@
 #ifndef AVCODEC_PPC_MATHOPS_H
 #define AVCODEC_PPC_MATHOPS_H
 
-#if defined(ARCH_POWERPC_405)
+#if defined(ARCH_PPC_405)
 /* signed 16x16 -> 32 multiply add accumulate */
 #define MAC16(rt, ra, rb) \
     __asm__ ("maclhw %0, %2, %3" : "=r" (rt) : "0" (rt), "r" (ra), "r" (rb));
diff --git a/libavcodec/simple_idct.c b/libavcodec/simple_idct.c
index 62f5b2456b346b40bfcf5e18d8a6f3da8f042bea..2f8edf83e0d1a05d83b438296e0cd88a5844869d 100644
--- a/libavcodec/simple_idct.c
+++ b/libavcodec/simple_idct.c
@@ -55,7 +55,7 @@
 #define COL_SHIFT 20 // 6
 #endif
 
-#if defined(ARCH_POWERPC_405)
+#if defined(ARCH_PPC_405)
 
 /* signed 16x16 -> 32 multiply add accumulate */
 #define MAC16(rt, ra, rb) \
diff --git a/libavutil/common.h b/libavutil/common.h
index 7185a8b03c00ef9d5aa22abbcade2369d93bfcb3..d66120fa661b6a2f3a0da196a262738ec92f1da4 100644
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -323,7 +323,7 @@ static inline av_pure int ff_get_fourcc(const char *s){
         }\
     }
 
-#if defined(ARCH_X86) || defined(ARCH_POWERPC) || defined(ARCH_BFIN)
+#if defined(ARCH_X86) || defined(ARCH_PPC) || defined(ARCH_BFIN)
 #define AV_READ_TIME read_time
 #if defined(ARCH_X86)
 static inline uint64_t read_time(void)