diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4bf697bcde6..9837d9c18a8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-29  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/31609
+	* gfortran.dg/entry_11.f90: New test.
+
 2007-07-29  Vladimir Yanovsky  <yanov@il.ibm.com>
             Revital Eres  <eres@il.ibm.com>
 
diff --git a/gcc/testsuite/gfortran.dg/entry_11.f90 b/gcc/testsuite/gfortran.dg/entry_11.f90
new file mode 100644
index 00000000000..07e7c34132b
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/entry_11.f90
@@ -0,0 +1,25 @@
+! { dg-do compile }
+! PR31609 module that calls a contained function with an ENTRY point
+! Test case derived from the PR
+
+MODULE ksbin1_aux_mod
+  CONTAINS
+    SUBROUTINE sub
+    i = k()
+    END SUBROUTINE sub
+    FUNCTION j () 
+      print *, "in j"    
+    j = 111 
+    ENTRY k () 
+      print *, "in k"    
+    k = 222
+    END FUNCTION j
+END MODULE ksbin1_aux_mod
+
+program testit
+  use ksbin1_aux_mod
+  l = j()
+  print *, l
+  l = k()
+  print *, l
+end program testit
\ No newline at end of file