diff --git a/docs/history.txt b/docs/history.txt
index 751fb70..060911c 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -350,6 +350,7 @@
         * portab.h: pragma aux default to gain ~800B unpacked size (Watcom)
           (the last 2 changes proposed by Bart Oldeman)
  + Changes Eduardo
+        * config.c: update hardcoded country and codepage IDs
         * country.asm: added NLS uppercase/collating tables (437,850,857,858)
         * inthndlr.c:
           - added Int 2Fh/26-29h processing for NLSFUNC (with Lucho)
diff --git a/hdr/nls.h b/hdr/nls.h
index af9763a..1e9e4fa 100644
--- a/hdr/nls.h
+++ b/hdr/nls.h
@@ -476,7 +476,7 @@ struct nlsInfoBlock {           /* This block contains all information
 };
 
 extern struct nlsInfoBlock nlsInfo;
-extern struct nlsPackage ASM nlsPackageHardcoded;
+extern struct nlsPackage      FAR ASM nlsPackageHardcoded;
         /* These are the "must have" tables within the hard coded NLS pkg */
 extern struct nlsFnamTerm     FAR ASM nlsFnameTermHardcoded;
 extern struct nlsDBCS         FAR ASM nlsDBCSHardcoded;
diff --git a/kernel/config.c b/kernel/config.c
index 1ab5319..4541eaf 100644
--- a/kernel/config.c
+++ b/kernel/config.c
@@ -1247,6 +1247,8 @@ err:printf("%s has invalid format\n", filename);
                                                      != entry.codepage
          && cpage)
           continue;
+        nlsPackageHardcoded.cntry = entry.country;
+        nlsPackageHardcoded.cp = entry.codepage;
         subf_data.length =      /* MS-DOS "CTYINFO" is up to 38 bytes */
                 min(subf_data.length, sizeof(struct CountrySpecificInfo));
       }
@@ -1255,7 +1257,7 @@ err:printf("%s has invalid format\n", filename);
     }
     goto ret;
   }
-  printf("couldn't find country info for country ID %u\n", ccode);
+  printf("couldn't find info for country ID %u\n", ccode);
 ret:
   close(fd);
 }
@@ -1796,11 +1798,7 @@ STATIC void config_init_fnodes(int f_nodes_cnt)
 */
 STATIC void SetAnyDos(PCStr p)
 {
-  if (*p) /* garbage at line end? */
-  {
-    CfgFailure(p);
-    return;
-  }
+  UNREFERENCED_PARAMETER(p);
   ReturnAnyDosVersionExpected = TRUE;
 }