diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c341ae8903c4..b3d135744cd9 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR libfortran/40962
+	* c_f_pointer_tests_4.f90:  New test.
+
 2009-08-20  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* gnat.dg/slice6.adb: New test.
diff --git a/gcc/testsuite/gfortran.dg/c_f_pointer_tests_4.f90 b/gcc/testsuite/gfortran.dg/c_f_pointer_tests_4.f90
new file mode 100644
index 000000000000..4f5338d605a8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/c_f_pointer_tests_4.f90
@@ -0,0 +1,15 @@
+! { dg-do run }
+program main
+   use iso_c_binding, only: c_ptr, c_loc, c_f_pointer
+   implicit none
+   integer, dimension(2,1,2), target :: table
+   table = reshape ( (/ 1,2,-1,-2/), (/2,1,2/))
+   call set_table (c_loc (table))
+contains
+   subroutine set_table (cptr)
+     type(c_ptr), intent(in) :: cptr
+     integer, dimension(:,:,:), pointer :: table_tmp
+     call c_f_pointer (cptr, table_tmp, (/2,1,2/))
+     if (any(table_tmp /= table)) call abort
+   end subroutine set_table
+end program main
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 7a0f056c9c98..b22306f8f475 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-20  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR libfortran/40962
+	* iso_c_binding.c (c_f_pointer_u0):  Multiply stride by
+	previous stride.
+
 2009-08-20  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* Makefile.am (LTLDFLAGS): Add -bindir flag.
diff --git a/libgfortran/intrinsics/iso_c_binding.c b/libgfortran/intrinsics/iso_c_binding.c
index 0dd7449df6d5..569b122f2360 100644
--- a/libgfortran/intrinsics/iso_c_binding.c
+++ b/libgfortran/intrinsics/iso_c_binding.c
@@ -152,7 +152,7 @@ ISO_C_BINDING_PREFIX (c_f_pointer_u0) (void *c_ptr_in,
 	    }
 	  else
 	    {
-	      str = GFC_DESCRIPTOR_EXTENT(f_ptr_out,i-1);
+	      str = str * GFC_DESCRIPTOR_EXTENT(f_ptr_out,i-1);
 	      f_ptr_out->offset += str;
 	    }