--- cmd_app.cpp.bak	2008-07-11 15:49:56.000000000 -0400
+++ cmd_app.cpp	2008-09-20 23:18:17.000000000 -0400
@@ -63,7 +63,13 @@
 	_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);
+
 		//_tcsncpy_s(tempString, "C:\\PICkit_2\\pk2cmd\\debug\\PK2DeviceFile.dat", 42);
 		//printf("DEBUG DEVICE FILE SETTING!!!!\n");
 	}