diff --git a/gas/ChangeLog b/gas/ChangeLog
index 46f9f8c00f..b870ed1263 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2008-06-04  Nick Clifton  <nickc@redhat.com>
+
+	* app.c (do_scrub_chars): Do not UNGET an EOF value.
+
 2008-06-03  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386.c (set_sse_check): New.
diff --git a/gas/app.c b/gas/app.c
index d8d0cc552d..4ba9edc7bc 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -832,7 +832,8 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
 	      /* Only keep this white if there's no white *after* the
 		 colon.  */
 	      ch2 = GET ();
-	      UNGET (ch2);
+	      if (ch2 != EOF)
+		UNGET (ch2);
 	      if (!IS_WHITESPACE (ch2))
 		{
 		  state = 9;
@@ -1116,7 +1117,8 @@ do_scrub_chars (int (*get) (char *, int), char *tostart, int tolen)
 #ifdef DOUBLEBAR_PARALLEL
 	case LEX_IS_DOUBLEBAR_1ST:
 	  ch2 = GET ();
-	  UNGET (ch2);
+	  if (ch2 != EOF)
+	    UNGET (ch2);
 	  if (ch2 != '|')
 	    goto de_fault;