diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 63172cb573b452a174bb4b89835824c19cb15608..819442c593fa225186977cf73fb62f96aa47cb3b 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-14  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	PR fortran/20467
+	* symbol.c (check_conflict): A dummy argument can't be a statement
+	function.
+
 2005-03-14  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* fortran/trans-intrinsic.c (gfc_conv_intrinsic_ishft): Convert
diff --git a/gcc/fortran/symbol.c b/gcc/fortran/symbol.c
index 0b5e8e727a44d5c713c8385df7df4e443a142e19..26e3f003442b0961d2b877e496fa695d1a9dc82d 100644
--- a/gcc/fortran/symbol.c
+++ b/gcc/fortran/symbol.c
@@ -369,6 +369,7 @@ check_conflict (symbol_attribute * attr, const char * name, locus * where)
 	{
 	case PROC_ST_FUNCTION:
 	  conf2 (in_common);
+	  conf2 (dummy);
 	  break;
 
 	case PROC_MODULE:
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8ed2b48f36586a0722dca36e07439d8cd40142f3..ef6463180c696b1295c6a59551cac25dffdc672d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-14  Tobias Schl"uter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	PR fortran/20467
+	* gfortran.dg/stfunc_2.f90: New test.
+
 2005-03-14  Zdenek Dvorak  <dvorakz@suse.cz>
 
 	* gcc.dg/tree-ssa/phi-opt-5.c: New test.
diff --git a/gcc/testsuite/gfortran.dg/stfunc_2.f90 b/gcc/testsuite/gfortran.dg/stfunc_2.f90
new file mode 100644
index 0000000000000000000000000000000000000000..75ecb057b05ff4f737a8faf98fdabd3405473553
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/stfunc_2.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! PR 20467 : we didn't check if a statement function had the dummy attribute.
+SUBROUTINE a(b)
+        b(c) = 0  ! { dg-error "Unclassifiable statement" }
+END SUBROUTINE a
+