diff --git a/ChangeLog b/ChangeLog
index 71efa7943..0bfc6521c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-27  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* lib/device.c (read_device_map): Don't parse a line, if it is
+	empty. Reported by Holger Bauer <bauer@itsm.uni-stuttgart.de>.
+	
 2000-10-25  Jochen Hoenicke  <jochen@gnu.org>
 
 	* stage2/builtins.c (md5crypt_func): Use all bits of currticks ()
diff --git a/lib/device.c b/lib/device.c
index ef993f569..24c99b3fe 100644
--- a/lib/device.c
+++ b/lib/device.c
@@ -370,6 +370,10 @@ read_device_map (FILE *fp, char **map, const char *map_file)
       /* Skip leading spaces.  */
       while (*ptr && isspace (*ptr))
 	ptr++;
+
+      /* Skip empty lines.  */
+      if (! *ptr)
+	continue;
       
       if (*ptr != '(')
 	{