diff --git a/util_ships.py b/util_ships.py
index 8bbfd813..b2105106 100644
--- a/util_ships.py
+++ b/util_ships.py
@@ -5,18 +5,21 @@ Copyright (c) EDCD, All Rights Reserved
 Licensed under the GNU General Public License.
 See LICENSE file.
 """
+from pathlib import Path
 from edmc_data import ship_name_map
 
 
 def ship_file_name(ship_name: str, ship_type: str) -> str:
     """Return a ship name suitable for a filename."""
     name = str(ship_name or ship_name_map.get(ship_type.lower(), ship_type)).strip()
-    if name.endswith('.'):
-        name = name[:-2]
 
-    if name.lower() in ('con', 'prn', 'aux', 'nul',
-                        'com0', 'com2', 'com3', 'com4', 'com5', 'com6', 'com7', 'com8', 'com9',
-                        'lpt0', 'lpt2', 'lpt3', 'lpt4', 'lpt5', 'lpt6', 'lpt7', 'lpt8', 'lpt9'):
-        name += '_'
+    # Handle suffix using Pathlib's with_suffix method
+    name = Path(name).with_suffix("").name
 
-    return name.translate({ord(x): '_' for x in ('\0', '<', '>', ':', '"', '/', '\\', '|', '?', '*')})
+    # Check if the name is a reserved filename
+    if Path(name).is_reserved():
+        name += "_"
+
+    return name.translate(
+        {ord(x): "_" for x in ("\0", "<", ">", ":", '"', "/", "\\", "|", "?", "*")}
+    )