diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha
index 19edf6f13e..9589dd338d 100644
--- a/ports/ChangeLog.alpha
+++ b/ports/ChangeLog.alpha
@@ -1,3 +1,8 @@
+2012-08-30  Richard Henderson  <rth@redhat.com>
+
+	* sysdeps/alpha/fpu/s_isnan.c: Define all aliases in terms of
+	the original __isnan symbol.
+
 2012-08-27  Mike Frysinger  <vapier@gentoo.org>
 
 	[BZ #5400]
diff --git a/ports/sysdeps/alpha/fpu/s_isnan.c b/ports/sysdeps/alpha/fpu/s_isnan.c
index b18c7bb5f1..1f239ac249 100644
--- a/ports/sysdeps/alpha/fpu/s_isnan.c
+++ b/ports/sysdeps/alpha/fpu/s_isnan.c
@@ -28,11 +28,6 @@
 #undef isnanf
 #undef __GI___isnanf
 
-/* The hidden_proto in include/math.h was obscured by the macro hackery.  */
-__typeof (__isnan) __isnanf;
-hidden_proto (__isnanf)
-
-
 int
 __isnan (double x)
 {
@@ -45,8 +40,11 @@ weak_alias (__isnan, isnan)
 /* It turns out that the 'double' version will also always work for
    single-precision.  */
 strong_alias (__isnan, __isnanf)
-hidden_def (__isnanf)
-weak_alias (__isnanf, isnanf)
+weak_alias (__isnan, isnanf)
+
+/* ??? GCC 4.8 fails to look through chains of aliases with asm names
+   attached.  Work around this for now.  */
+hidden_ver (__isnan, __isnanf)
 
 #ifdef NO_LONG_DOUBLE
 strong_alias (__isnan, __isnanl)