diff --git a/ChangeLog b/ChangeLog
index e4690794bd989f2ee5838410a0a62b38bd43327d..e0158f7e2c45c98023839827d81bb41f790a3802 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-31  Per Cederqvist  <ceder@lysator.liu.se>
+
+	Avoid calling ungetc() on EOF.
+	* src/server/ram-parse.c (fskipwhite): Don't unget EOF.
+
 2008-03-31  Per Cederqvist  <ceder@lysator.liu.se>
 
 	Turn off the garb by default, due to popular request.
diff --git a/src/server/ram-parse.c b/src/server/ram-parse.c
index ec827402cfac8eed7e5fff000dab14789bc96b15..c364cc096a219c74daf1a82e26a0a0f45e4bc9df 100644
--- a/src/server/ram-parse.c
+++ b/src/server/ram-parse.c
@@ -72,7 +72,8 @@ fskipwhite(struct dbfile *fp)
     while ( (c = dbfile_getc(fp)) != EOF && /* isascii(c) && */ isspace(c) )
 	;
 
-    dbfile_ungetc(fp, c);
+    if (c != EOF)
+	dbfile_ungetc(fp, c);
 }
 
 extern unsigned long