diff --git a/configure.in b/configure.in
index d342e09..89c4d16 100644
--- a/configure.in
+++ b/configure.in
@@ -374,6 +374,16 @@
 ],
 glibc="2.4")
 
+AC_EGREP_CPP([GLIBC_25], [
+#include <features.h>
+#ifdef __GNU_LIBRARY__
+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 5)
+  GLIBC_25
+ #endif
+#endif
+],
+glibc="2.5")
+
 AC_MSG_CHECKING([the glibc version])
 
 case "${glibc}" in
@@ -395,9 +405,15 @@
 	DEFAULT_SUPP="glibc-2.4.supp ${DEFAULT_SUPP}"
 	;;
 
+     2.5)
+	AC_MSG_RESULT(2.5 family)
+	AC_DEFINE([GLIBC_2_5], 1, [Define to 1 if you're using glibc 2.5.x])
+	DEFAULT_SUPP="glibc-2.5.supp ${DEFAULT_SUPP}"
+	;;
+
      *)
 	AC_MSG_RESULT(unsupported version)
-	AC_MSG_ERROR([Valgrind requires glibc version 2.2, 2.3 or 2.4])
+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.5])
 	;;
 esac