diff --git a/ChangeLog b/ChangeLog
index 23f1a1ff5c..63daabbff1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-03-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
+
+	* resolv/res_hconf.c (parse_line): Skip empty lines.  Bug reported
+	by Marcus Harnisch <marcus@harnisch.isdn.cs.tu-berlin.de>.
+
 1999-03-01  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* sysdeps/i386/sys/ucontext.h (ucontext): Rename field uc_links to
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c
index 3905360d50..06306f7726 100644
--- a/resolv/res_hconf.c
+++ b/resolv/res_hconf.c
@@ -263,7 +263,8 @@ parse_line (const char *fname, int line_num, const char *str)
 
   str = skip_ws (str);
 
-  if (*str == '#') return;		/* skip line comment */
+  /* skip line comment and empty lines: */
+  if (*str == '\0' || *str == '#') return;
 
   start = str;
   str = skip_string (str);