diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
index d564ed0bad8..30c37961829 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/LinkableRuntimeImage.java
@@ -93,7 +93,7 @@ public class LinkableRuntimeImage {
                     // Skip comments
                     continue;
                 }
-                upgradeableFiles.add(scanner.nextLine());
+                upgradeableFiles.add(line);
             }
         } catch (IOException e) {
             throw new AssertionError("Failure to retrieve upgradeable files for " +
diff --git a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf
index df2ca809f08..fc5e7b4f328 100644
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/runtimelink/upgrade_files_java.base.conf
@@ -1,4 +1,4 @@
 # Configuration for resource paths of files allowed to be
 # upgraded (in java.base)
-lib/tzdb.dat
 lib/security/cacerts
+lib/tzdb.dat