diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc04564d..dd624761 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Release history for s390-tools (MIT version)
   - dbginfo: Gather nvme related data
 
   Bug Fixes:
+  - hmcdrvfs: fix parsing of link count >= 1000
 
 * __v2.3.0 (2018-01-30)__
 
diff --git a/hmcdrvfs/hmcdrvfs.c b/hmcdrvfs/hmcdrvfs.c
index f49fbba5..3cf10056 100644
--- a/hmcdrvfs/hmcdrvfs.c
+++ b/hmcdrvfs/hmcdrvfs.c
@@ -821,10 +821,13 @@ static char *hmcdrv_parse_line(char *line, char *namebuf,
 		if ((*line != '\0') && (*line != '\n')) {
 			field = hmcdrv_parse_ntoken(field, line, &attr);
 
-			while ((*line != '\0') &&
-			       (*line != '\n') &&
-			       !isspace(*line))
+			while ((*line != '\0') && (*line != '\n')) {
+				if (isspace(*line))
+					break;
+				if (field == 1 && isdigit(*line))
+					break;
 				++line; /* search end of field */
+			}
 		}
 	} /* while */