diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 5486c8eb78a..7ef520553ed 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-19  Erik Edelmann  <eedelman@gcc.gnu.org>
+
+	PR fortran/26201
+	* intrinsic.c (gfc_convert_type_warn): Call
+	gfc_intrinsic_symbol() on the newly created symbol.
+
 2005-02-19  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/25054
diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c
index cc63a5f66fc..56f92a2dca3 100644
--- a/gcc/fortran/intrinsic.c
+++ b/gcc/fortran/intrinsic.c
@@ -3428,6 +3428,7 @@ gfc_convert_type_warn (gfc_expr * expr, gfc_typespec * ts, int eflag,
   new->symtree->n.sym->attr.elemental = 1;
   new->symtree->n.sym->attr.pure = 1;
   new->symtree->n.sym->attr.referenced = 1;
+  gfc_intrinsic_symbol(new->symtree->n.sym);
   gfc_commit_symbol (new->symtree->n.sym);
 
   *expr = *new;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6cca5da64c6..c830c02761f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-19  Erik Edelmann  <eedelman@gcc.gnu.org>
+
+	PR fortran/26201
+	* gfortran.dg/convert_1.f90: New.
+
 2005-02-19  Paul Thomas  <pault@gcc.gnu.org>
 
 	PR fortran/25054
diff --git a/gcc/testsuite/gfortran.dg/convert_1.f90 b/gcc/testsuite/gfortran.dg/convert_1.f90
new file mode 100644
index 00000000000..0723cd012f1
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/convert_1.f90
@@ -0,0 +1,16 @@
+! { dg-do compile }
+! PR 26201: Check that the __convert_*_* functions are treated as intrinsics
+! rather than module functions.
+! Testcase contributed by Philippe Schaffnit and François-Xavier Coudert.
+MODULE MODULE_A
+    REAL :: a = 0
+END MODULE MODULE_A
+
+MODULE MODULE_B
+    REAL :: b = 0
+END MODULE MODULE_B
+
+USE MODULE_A
+USE MODULE_B
+a = 0
+END