diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a62ea30fa9c..1971c290f01 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
+
+	PR fortran/35991
+	gfortran.dg/zero-sized_4.f90: New test.
+
 2008-04-20  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR fortran/35882
diff --git a/gcc/testsuite/gfortran.dg/zero_sized_4.f90 b/gcc/testsuite/gfortran.dg/zero_sized_4.f90
new file mode 100644
index 00000000000..fe5f5f68241
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/zero_sized_4.f90
@@ -0,0 +1,14 @@
+! { dg-do run }
+! PR35991 run-time abort for CSHIFT of zero sized array
+! Divide by zero exception before the patch.
+      program try_gf0045
+      call       gf0045(  9,  8)
+      end
+
+      subroutine GF0045(nf9,nf8)
+      REAL RDA(10)
+      REAL RDA1(0)
+
+      RDA(NF9:NF8) = CSHIFT ( RDA1 ,1)
+
+      END SUBROUTINE