diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 447ed783249..182563cb848 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-11  Tobias Burnus  <burnus@net-b.de>
+
+	* trans-intrinsic.c (gfc_build_builtin_function_decls):
+	Change type of second argument to int.
+
 2014-05-09  Mike Stump  <mikestump@comcast.net>
 
 	PR fortran/61109
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index 5dd5d2aa292..3972ed36455 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -3264,7 +3264,7 @@ gfc_build_builtin_function_decls (void)
 
       gfor_fndecl_caf_num_images = gfc_build_library_function_decl (
 		   get_identifier (PREFIX("caf_num_images")), integer_type_node,
-		   2, integer_type_node, boolean_type_node);
+		   2, integer_type_node, integer_type_node);
 
       gfor_fndecl_caf_register = gfc_build_library_function_decl_with_spec (
 	get_identifier (PREFIX("caf_register")), "...WWW", pvoid_type_node, 6,
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 1b17c28c1c1..709225c3bd1 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,10 @@
+2014-05-11  Tobias Burnus  <burnus@net-b.de>
+
+	* caf/libcaf.h (_gfortran_caf_num_images): Change type of
+	second argument to int.
+	* caf/mpi.c (_gfortran_caf_num_images): Ditto.
+	* caf/single.c (_gfortran_caf_num_images): Ditto.
+
 2014-05-08  Tobias Burnus  <burnus@net-b.de>
 
 	* caf/libcaf.h (caf_vector_t, _gfortran_caf_co_sum,
diff --git a/libgfortran/caf/libcaf.h b/libgfortran/caf/libcaf.h
index f60eebc7b80..1c01f9f09b3 100644
--- a/libgfortran/caf/libcaf.h
+++ b/libgfortran/caf/libcaf.h
@@ -81,7 +81,7 @@ void _gfortran_caf_init (int *, char ***);
 void _gfortran_caf_finalize (void);
 
 int _gfortran_caf_this_image (int);
-int _gfortran_caf_num_images (int, bool);
+int _gfortran_caf_num_images (int, int);
 
 void *_gfortran_caf_register (size_t, caf_register_t, caf_token_t *, int *,
 			      char *, int);
diff --git a/libgfortran/caf/mpi.c b/libgfortran/caf/mpi.c
index fe2baf4633c..8d8c7de21a9 100644
--- a/libgfortran/caf/mpi.c
+++ b/libgfortran/caf/mpi.c
@@ -123,7 +123,7 @@ _gfortran_caf_this_image (int distance __attribute__ ((unused)))
 
 int
 _gfortran_caf_num_images (int distance __attribute__ ((unused)),
-			  bool failed __attribute__ ((unused)))
+			  int failed __attribute__ ((unused)))
 {
   return caf_num_images;
 }
diff --git a/libgfortran/caf/single.c b/libgfortran/caf/single.c
index b8833275d62..521c93c34b0 100644
--- a/libgfortran/caf/single.c
+++ b/libgfortran/caf/single.c
@@ -87,7 +87,7 @@ _gfortran_caf_this_image (int distance __attribute__ ((unused)))
 
 int
 _gfortran_caf_num_images (int distance __attribute__ ((unused)),
-			  bool failed __attribute__ ((unused)))
+			  int failed __attribute__ ((unused)))
 {
   return 1;
 }