diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 888432ebfbea82f78b25ab6d6928c106e6eaf5d8..ecdf2defe16d943e0731e8c0dcde1c7122705906 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-31  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/47042
+	* resolve.c (resolve_fl_procedure): Reject stmt functions
+	with pointer/allocatable attribute.
+
 2011-01-31  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/47042
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c
index 55b5183776fcd3953fb14ee1e09b44cef4343a19..20be0d199d1722f6ea9c6a80441dc2a0faf2d41d 100644
--- a/gcc/fortran/resolve.c
+++ b/gcc/fortran/resolve.c
@@ -10231,6 +10231,14 @@ resolve_fl_procedure (gfc_symbol *sym, int mp_flag)
       return FAILURE;
     }
 
+  if (sym->attr.proc == PROC_ST_FUNCTION
+      && (sym->attr.allocatable || sym->attr.pointer))
+    {
+      gfc_error ("Statement function '%s' at %L may not have pointer or "
+		 "allocatable attribute", sym->name, &sym->declared_at);
+      return FAILURE;
+    }
+
   /* 5.1.1.5 of the Standard: A function name declared with an asterisk
      char-len-param shall not be array-valued, pointer-valued, recursive
      or pure.  ....snip... A character value of * may only be used in the
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4d432ef6d1710dee4c08b8753ccd6a4f6c796f06..c8de82a755b431780b15c8b955e26810d2396ab2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-31  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/47042
+	* gfortran.dg/stmt_func_1.f90: New.
+
 2011-01-31  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/47042
diff --git a/gcc/testsuite/gfortran.dg/stmt_func_1.f90 b/gcc/testsuite/gfortran.dg/stmt_func_1.f90
new file mode 100644
index 0000000000000000000000000000000000000000..072f21b1b6362cc4705e73e8e4d35927b9843021
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/stmt_func_1.f90
@@ -0,0 +1,12 @@
+! { dg-compile }
+! { dg-options "" }
+!
+! PR fortran/47542
+!
+integer, target, save :: tgt = 77
+integer, pointer ::ptr_stmt  ! { dg-error "Statement function .ptr_stmt. at .1. may not have pointer or allocatable attribute" }
+integer, allocatable :: alloc_stmt ! { dg-error "Statement function .alloc_stmt. at .1. may not have pointer or allocatable attribute" }
+
+ptr_stmt() = tgt
+alloc_stmt() = 78
+end