diff --git a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt
index 38f7fffec..44e023f67 100644
--- a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt	
+++ b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 211 GET OR SET MEMORY ALLOCATION STRATEGY.txt	
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
- Unique ID: 215800
+ Unique ID: 2158-sort-as-215800
   Category: D 	DOS kernel
       Flag: n/a
 --------------------------------------------------------------------------------
diff --git a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt
index ea62c6f66..ee92014bb 100644
--- a/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt	
+++ b/source/Interrupt List/INT 21 DOS Function Calls/INT 2158 DOS 5 GET OR SET UMB LINK STATE.txt	
@@ -1,5 +1,5 @@
 --------------------------------------------------------------------------------
- Unique ID: 215802
+ Unique ID: 2158-sort-as-215802
   Category: D 	DOS kernel
       Flag: n/a
 --------------------------------------------------------------------------------
diff --git a/utilities/makelist/makelist.lpr b/utilities/makelist/makelist.lpr
index 1a4f9af3b..5e1661f11 100644
--- a/utilities/makelist/makelist.lpr
+++ b/utilities/makelist/makelist.lpr
@@ -632,13 +632,14 @@ procedure AddSMM(const Name : String; var Data : RawByteString);
 end;
 
 procedure FileToSection(const Name : String; var Data : RawByteString;
-  out ID, Category, Flags : String);
+  out IDSORT, IDLIST, Category, Flags : String);
 var
-  I : Integer;
+  I, SORTAS : Integer;
   H : TArrayOfString;
   K, V : String;
 begin
-  ID:='';
+  IDSORT:='';
+  IDLIST:='';
   Category:='';
   Flags:='';
   // Remove Header Stub from Data
@@ -655,9 +656,15 @@ procedure FileToSection(const Name : String; var Data : RawByteString;
     H[I]:=Trim(H[I]);
     case UpperCase(K) of
       'UNIQUE ID' : begin
-        ID:=V;
+        IDSORT:=V;
+        IDLIST:=V;
         if H[I] <> '' then
           LogMessage(vbMinimal, 'Extraneous Data in Unique ID for file: '+ Name);
+        SORTAS := Pos('-sort-as-', IDSORT);
+        if SORTAS > 0 then begin
+          IDSORT := Copy(IDSORT, SORTAS + Length('-sort-as-'));
+          IDLIST := Copy(IDLIST, 1, SORTAS - 1);
+        end;
       end;
       'CATEGORY' : begin
         if UpperCase(V) = 'N/A' then
@@ -739,10 +746,10 @@ procedure HighestTable(const Name : String; const Data : RawByteString);
 
 procedure AddStandard(const Name : String; var Data : RawByteString);
 var
-  ID, Category, Flags : String;
+  IDSORT, IDLIST, Category, Flags : String;
 begin
-  FileToSection(Name, Data, ID, Category, Flags);
-  if ID='' then begin
+  FileToSection(Name, Data, IDSORT, IDLIST, Category, Flags);
+  if IDLIST='' then begin
     LogMessage(vbMinimal, TAB + 'No ID found for file: ' + Name);
     WriteIssue;
     Inc(TotalErrors);
@@ -763,7 +770,7 @@ procedure AddStandard(const Name : String; var Data : RawByteString);
     Inc(TotalErrors);
     Exit;
   end;
-  AddToTree(Name, ID + SPACE + CATEGORY, SectionEntry(ID, Category) + Data);
+  AddToTree(Name, IDSORT, SectionEntry(IDLIST, Category) + Data);
 end;
 
 procedure AddDataFiles;