diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 4f5eed45d52cde6bd3b23bfafe952882b7d9032c..48b7e94087945974a172007d32b69ec3f1780e80 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-04  Francois-Xavier Coudert  <coudert@clipper.ens.fr>
+
+	PR libfortran/30007
+	* libgfortran.h: Do not prefix symbol name with
+	__USER_LABEL_PREFIX__ when used in __attribute__((__alias__(...))).
+
 2007-02-02  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/30284
diff --git a/libgfortran/libgfortran.h b/libgfortran/libgfortran.h
index af53e4800098b51d1400d8d1c3f88bfb246ef7b2..2f7a5396eeffccd6b4e7ddb0bc8eea4f27e4682a 100644
--- a/libgfortran/libgfortran.h
+++ b/libgfortran/libgfortran.h
@@ -126,10 +126,10 @@ typedef off_t gfc_offset;
 # define export_proto(x)	sym_rename(x, PREFIX(x))
 # define export_proto_np(x)	extern char swallow_semicolon
 # define iexport_proto(x)	internal_proto(x)
-# define iexport(x)		iexport1(x, __USER_LABEL_PREFIX__, IPREFIX(x))
-# define iexport1(x,p,y)	iexport2(x,p,y)
-# define iexport2(x,p,y) \
-	extern __typeof(x) PREFIX(x) __attribute__((__alias__(#p #y)))
+# define iexport(x)		iexport1(x, IPREFIX(x))
+# define iexport1(x,y)		iexport2(x,y)
+# define iexport2(x,y) \
+	extern __typeof(x) PREFIX(x) __attribute__((__alias__(#y)))
 /* ??? We're not currently building a dll, and it's wrong to add dllexport
    to objects going into a static library archive.  */
 #elif 0 && defined(HAVE_ATTRIBUTE_DLLEXPORT)