diff --git a/configure/os/CONFIG.Common.raspbian-arm b/configure/os/CONFIG.Common.raspbian-arm
index 6c69dcfe7..6fee9eedb 100644
--- a/configure/os/CONFIG.Common.raspbian-arm
+++ b/configure/os/CONFIG.Common.raspbian-arm
@@ -10,13 +10,13 @@ include $(CONFIG)/os/CONFIG.Common.linuxCommon
 # Due to missing/messed up libs in the toolchain, readline needs copies of
 # libtinfo.so.5.9 and libreadline.so.6.2 from a Raspbian 7 rootfs
 # /lib/arm-linux-gnueabihf/ to the toolchain, e.g.
-# $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
+# $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/lib/arm-linux-gnueabihf/
 # and manually created links libtinfo.so.5 and libreadline.so.
 # For gcc-linaro-arm-linux-gnueabihf-raspbian, an existing incompatible
 # libtinfo.so.5 is in the way. Remove it.
 # (Built with glibc 2.16 like installed on Raspbian 9 but toolchain uses glibc 2.13.)
 # Also copy /usr/include/readline/ directory from some readline 6 installation
-# to $(SDK_DIR)/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/usr/include/
+# to $(SDK_DIR)/$(SDK_TARGET)/arm-linux-gnueabihf/libc/usr/include/
 
 ARCH_CLASS = arm
 
@@ -25,10 +25,10 @@ SDK_DIR = /opt/raspberrypi/arm-bcm2708
 # Available SDK_TARGETs:
 
 # gcc 4.8.3 for 32 bit hosts with GLIBC 2.3 or higher
-SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
+# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian
 
 # gcc 4.8.3 for 64 bit hosts with GLIBC 2.14 or higher
-# SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
+SDK_TARGET = gcc-linaro-arm-linux-gnueabihf-raspbian-x64
 
 # gcc 4.7.1 for 64 bit hosts with GLIBC 2.8 or higher
 # SDK_TARGET = arm-linux-gnueabihf
diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common
index 541f2bf88..5e214edec 100644
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -48,9 +48,6 @@ CROSS_COMPILER_TARGET_ARCHS += eldk42-ppc4xxFP
 # (No PVA because of old compiler)
 #CROSS_COMPILER_TARGET_ARCHS += V62-ppc604
 
-# Raspberry Pi
-CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
-
 # RTEMS (Can only have 1 RTEMS major version in 1 EPICS installation
 # because they overwrite their header files.)
 #CROSS_COMPILER_TARGET_ARCHS += RTEMS49-pc386
diff --git a/configure/os/CONFIG_SITE.linux-x86_64.Common b/configure/os/CONFIG_SITE.linux-x86_64.Common
index 310b795ef..badaadd3f 100644
--- a/configure/os/CONFIG_SITE.linux-x86_64.Common
+++ b/configure/os/CONFIG_SITE.linux-x86_64.Common
@@ -27,5 +27,8 @@ CROSS_COMPILER_TARGET_ARCHS += deb10-x86_64
 # Newer DeltaTau PowerPMAC
 #CROSS_COMPILER_TARGET_ARCHS += gcc8-ppc4xxFP
 
+# Raspberry Pi
+CROSS_COMPILER_TARGET_ARCHS += raspbian-arm
+
 # NI Linux Real-Time 7.x
 CROSS_COMPILER_TARGET_ARCHS += nilrt7-armv7a