diff -urN pk2cmd.orig/cmd_app.cpp pk2cmd/cmd_app.cpp --- pk2cmd.orig/cmd_app.cpp 2023-11-24 10:19:23.781309788 +0100 +++ pk2cmd/cmd_app.cpp 2023-11-24 10:20:27.795077953 +0100 @@ -88,7 +88,14 @@ _tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString); if (_tcslen(tempString) < 17) { - _tcsncpy_s(tempString, "PK2DeviceFile.dat", 17); + // Try /usr/share/pk2 first + _tcsncpy_s(tempString, "/usr/share/pk2/PK2DeviceFile.dat", 32); + + if(access(tempString, 0)) + { + // Well, that didn't work, default to the current directory + _tcsncpy_s(tempString, "PK2DeviceFile.dat", 17); + } } } if (!PicFuncs.ReadDeviceFile(tempString))