diff --git a/ChangeLog.arm b/ChangeLog.arm
index e4e637173f..6a9bdde8fe 100644
--- a/ChangeLog.arm
+++ b/ChangeLog.arm
@@ -1,3 +1,8 @@
+2011-05-07  Konstantinos Margaritis  <markos@genesi-usa.com>
+
+	* sysdeps/arm/preconfigure: Detect arm-linux-gnueabi* as ARM EABI.
+	* sysdeps/arm/shlib-versions: Ditto.
+
 2011-04-26  Manjunath Matti  <manjunath81@gmail.com>
 
 	* sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
diff --git a/sysdeps/arm/preconfigure b/sysdeps/arm/preconfigure
index 4b974cbe94..e7693d4e7d 100644
--- a/sysdeps/arm/preconfigure
+++ b/sysdeps/arm/preconfigure
@@ -2,7 +2,7 @@ case "$machine" in
 arm*)
 	base_machine=arm
 	case $config_os in
-	linux-gnueabi)
+	linux-gnueabi*)
 		machine=arm/eabi/$machine
 		if [ "${CFLAGS+set}" != "set" ]; then
 		  CFLAGS="-g -O2"
diff --git a/sysdeps/arm/shlib-versions b/sysdeps/arm/shlib-versions
index ed6603f076..491dd0adc7 100644
--- a/sysdeps/arm/shlib-versions
+++ b/sysdeps/arm/shlib-versions
@@ -1,4 +1,4 @@
-arm.*-.*-linux-gnueabi	DEFAULT			GLIBC_2.4
+arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
 
-arm.*-.*-linux-gnueabi	ld=ld-linux.so.3
+arm.*-.*-linux-gnueabi.*	ld=ld-linux.so.3
 arm.*-.*-linux.*	ld=ld-linux.so.2