diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4fe45de0b54..5f940c11b19 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-30  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR libfortran/36895
+	* gfortran.dg/namelist_53.f90: New test.
+
 2008-08-29  Michael Meissner  <gnu@the-meissners.org>
 
 	* gcc.target/i386/sse-22.c: Change #pragma GCC option to #pragma
diff --git a/gcc/testsuite/gfortran.dg/namelist_53.f90 b/gcc/testsuite/gfortran.dg/namelist_53.f90
new file mode 100644
index 00000000000..d4fdf574e0e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/namelist_53.f90
@@ -0,0 +1,9 @@
+! { dg-do run }
+! PR36895 Namelist writing to internal files
+  character(30) :: line
+  namelist /stuff/ n
+  n = 123
+  line = ""
+  write(line,nml=stuff)
+  if (line.ne."&STUFF  N=        123,  /") call abort
+  end