diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 4ec7835ddec..a443622caa0 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-12  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/61628
+	* trans-types.c (gfc_init_types): Fix data-type bug
+	with gfc_max_array_element_size.
+
 2014-07-12  Tobias Burnus  <burnus@net-b.de>
 
 	* libgfortran.h (libcaf_atomic_codes): Add.
diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c
index e55e2d9c1f5..ad28c28bee9 100644
--- a/gcc/fortran/trans-types.c
+++ b/gcc/fortran/trans-types.c
@@ -955,9 +955,9 @@ gfc_init_types (void)
 
   n = TYPE_PRECISION (gfc_array_index_type) - GFC_DTYPE_SIZE_SHIFT;
   gfc_max_array_element_size
-    = wide_int_to_tree (long_unsigned_type_node,
+    = wide_int_to_tree (size_type_node,
 			wi::mask (n, UNSIGNED,
-				  TYPE_PRECISION (long_unsigned_type_node)));
+				  TYPE_PRECISION (size_type_node)));
 
   boolean_type_node = gfc_get_logical_type (gfc_default_logical_kind);
   boolean_true_node = build_int_cst (boolean_type_node, 1);