diff --git a/config/fx9860g.cfg b/config/fx9860g.cfg
index f6b0af1..c15f539 100644
--- a/config/fx9860g.cfg
+++ b/config/fx9860g.cfg
@@ -1,5 +1,5 @@
 # Casio fx9860g library
 TARGET = libTeX-fx.a
 CFLAGS = -m3 -mb -D TEX_PLATFORM_FX9860G -D FX9860G -Os -ffreestanding
-CC = sh3eb-elf-gcc
-AR = sh3eb-elf-ar
+CC = $(TOOLCHAIN)-gcc
+AR = $(TOOLCHAIN)-ar
diff --git a/config/fxcg50.cfg b/config/fxcg50.cfg
index ae569d4..0181fd7 100644
--- a/config/fxcg50.cfg
+++ b/config/fxcg50.cfg
@@ -1,5 +1,5 @@
 # Casio fxcg50 library
 TARGET = libTeX-cg.a
 CFLAGS = -m4-nofpu -mb -D TEX_PLATFORM_FXCG50 -D FXCG50 -Os -ffreestanding
-CC = sh4eb-elf-gcc
-AR = sh4eb-elf-ar
+CC = $(TOOLCHAIN)-gcc
+AR = $(TOOLCHAIN)-ar
diff --git a/configure b/configure
index d7cf99c..a5ea799 100755
--- a/configure
+++ b/configure
@@ -60,8 +60,8 @@ fi
 
 # Guess toolchains
 
-[[ $platform == fx9860g && -z $toolchain ]] && toolchain=sh3eb-elf
-[[ $platform == fxcg50  && -z $toolchain ]] && toolchain=sh4eb-elf
+[[ $platform == fx9860g && -z $toolchain ]] && toolchain=sh-elf
+[[ $platform == fxcg50  && -z $toolchain ]] && toolchain=sh-elf
 
 # Guess compiler paths