diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index fba0d985b0dc..cf406eba3c88 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/78239
+	* decl.c(char_len_param_value): Also check for -fimplicit-none
+	when determining if implicit none is in force.
+
 2016-12-16  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
 	PR fortran/78622
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 11e6d9a288b6..396a048492f8 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-17  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+	PR fortran/78239
+	* gfortran.dg/fimplicit_none_1.f90:  New test.
+	* gfortran.dg/fimplicit_none_2.f90:  New test.
+
 2016-12-16  Kelvin Nilsen  <kelvin@gcc.gnu.org>
 
 	* gcc.target/powerpc/byte-in-either-range-0.c: New test.
diff --git a/gcc/testsuite/gfortran.dg/fimplicit_none_1.f90 b/gcc/testsuite/gfortran.dg/fimplicit_none_1.f90
new file mode 100644
index 000000000000..997584e0b3d8
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/fimplicit_none_1.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! { dg-options "-fimplicit-none" }
+subroutine s(n) ! { dg-error "has no IMPLICIT type" }
+   character(n) :: c  ! { dg-error "Scalar INTEGER expression expected" }
+   c = 'c' ! { dg-error "has no IMPLICIT type" }
+end
diff --git a/gcc/testsuite/gfortran.dg/fimplicit_none_2.f90 b/gcc/testsuite/gfortran.dg/fimplicit_none_2.f90
new file mode 100644
index 000000000000..fa8a8f4d0556
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/fimplicit_none_2.f90
@@ -0,0 +1,6 @@
+! { dg-do compile }
+! { dg-options "-fimplicit-none" }
+! PR fortran/78239 - used to ICE
+program p
+   character(*), parameter :: z(2) = [character(n) :: 'x', 'y'] ! { dg-error "Scalar INTEGER expression expected" }
+end