diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a23a6e05cf9..3eb02c25aa5 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90985
+	* decl.c (gfc_match_data): In free-form code, DATA be followed by
+	whitespace.
+
 2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/90986
diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c
index a7886b0efcd..1415b97267f 100644
--- a/gcc/fortran/decl.c
+++ b/gcc/fortran/decl.c
@@ -621,6 +621,13 @@ gfc_match_data (void)
   gfc_expr *e;
   gfc_ref *ref;
   match m;
+  char c;
+
+  /* DATA has been matched.  In free form source code, the next character
+     needs to be whitespace.  Check that here.  */
+  c = gfc_peek_ascii_char ();
+  if (gfc_current_form == FORM_FREE && !gfc_is_whitespace (c))
+    return MATCH_NO;
 
   /* Before parsing the rest of a DATA statement, check F2008:c1206.  */
   if ((gfc_current_state () == COMP_FUNCTION
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index af4769f80ea..8f58e185efe 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
+
+	PR fortran/90985
+	* gfortran.dg/pr90985.f90: New test.
+
 2019-08-02  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	PR fortran/90986
diff --git a/gcc/testsuite/gfortran.dg/pr90985.f90 b/gcc/testsuite/gfortran.dg/pr90985.f90
new file mode 100644
index 00000000000..48f5023099e
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/pr90985.f90
@@ -0,0 +1,14 @@
+! { dg-do compile }
+module mymod
+  type :: mytyp
+    integer :: i
+  end type mytyp
+contains
+  subroutine mysub
+    implicit none
+    type(mytyp) :: a
+    integer :: datai,dataj
+    datai = a%i
+    dataj = a%j         ! { dg-error "is not a member of the" }
+  end subroutine mysub
+end module mymod