diff --git a/src/PlatformId.cpp b/src/PlatformId.cpp
index 34c18da6b..d3e22b5b3 100644
--- a/src/PlatformId.cpp
+++ b/src/PlatformId.cpp
@@ -6,57 +6,63 @@ extern const char* mameNameToRealName[];
 namespace PlatformIds
 {
 	const char* PlatformNames[PLATFORM_COUNT + 1] = {
-		"unknown", // = 0,
+		"unknown", // nothing set
 
-		"3do", // = 1,
-		"amiga", // = 2,
-		"arcade", // = 3,
-		"atari2600", // = 4,
-		"atari5200", // = 5,
-		"atari7800", // = 6,
-		"atariJaguar", // = 7,
-		"atariJaguarCD", // = 8,
-		"atariXE", // = 9,
-		"colecovision", // = 10,
-		"commodore64", // = 11,
-		"intellivision", // = 12,
-		"mac", // = 13,
-		"xbox", // = 14,
-		"xbox360", // = 15,
-		"neogeo", // = 16,
-		"ngp", // = 17,
-		"ngpc", // = 18,
-		"n3ds", // = 19,
-		"n64", // = 20,
-		"nds", // = 21,
-		"nes", // = 22,
-		"gb", // = 23,
-		"gba", // = 24,
-		"gbc", // = 25,
-		"gamecube", // = 26,
-		"wii", // = 27,
-		"wiiu", // = 28,
-		"pc", // = 29,
-		"sega32x", // = 30,
-		"segacd", // = 31,
-		"dreamcast", // = 32,
-		"gamegear", // = 33,
-		"genesis", // = 34,
-		"mastersystem", // = 35,
-		"megadrive", // = 36,
-		"saturn", // = 37,
-		"psx", // = 38,
-		"ps2", // = 39,
-		"ps3", // = 40,
-		"ps4", // = 41,
-		"psvita", // = 42,
-		"psp", // = 43,
-		"snes", // = 44,
-		"pcengine", // = 45,
-		"zxspectrum", // = 46,
+		"3do",
+		"amiga",
+		"arcade",
+		"apple2",
+		"atari800",
+		"atari2600",
+		"atari5200",
+		"atari7800",
+		"atarilynx",
+		"atarist",
+		"atarijaguar",
+		"atarijaguarcd",
+		"atarixe",
+		"colecovision",
+		"c64", // commodore 64
+		"intellivision",
+		"mac",
+		"xbox",
+		"xbox360",
+		"neogeo",
+		"ngp", // neo geo pocket
+		"ngpc", // neo geo pocket color
+		"n3ds", // nintendo 3DS
+		"n64", // nintendo 64
+		"nds", // nintendo DS
+		"nes", // nintendo entertainment system
+		"gb", // game boy
+		"gba", // game boy advance
+		"gbc", // game boy color
+		"gc", // gamecube
+		"wii",
+		"wiiu",
+		"pc",
+		"sega32x",
+		"segacd",
+		"dreamcast",
+		"gamegear",
+		"genesis", // sega genesis
+		"mastersystem", // sega master system
+		"megadrive", // sega megadrive
+		"saturn", // sega saturn
+		"psx",
+		"ps2",
+		"ps3",
+		"ps4",
+		"psvita",
+		"psp", // playstation portable
+		"snes", // super nintendo entertainment system
+		"pcengine", // turbografx-16/pcengine
+		"wonderswan",
+		"wonderswancolor",
+		"zxspectrum",
 
-		"ignore", // = 47 // do not allow scraping for this system
-		"invalid" // = 48
+		"ignore", // do not allow scraping for this system
+		"invalid"
 	};
 
 	PlatformId getPlatformId(const char* str)
diff --git a/src/PlatformId.h b/src/PlatformId.h
index 1b888021e..662de65dc 100644
--- a/src/PlatformId.h
+++ b/src/PlatformId.h
@@ -8,55 +8,61 @@ namespace PlatformIds
 	{
 		PLATFORM_UNKNOWN = 0,
 
-		THREEDO = 1, //name can't start with a constant
-		AMIGA = 2,
-		ARCADE = 3,
-		ATARI_2600 = 4,
-		ATARI_5200 = 5,
-		ATARI_7800 = 6,
-		ATARI_JAGUAR = 7,
-		ATARI_JAGUAR_CD = 8,
-		ATARI_XE = 9,
-		COLECOVISION = 10,
-		COMMODORE_64 = 11,
-		INTELLIVISION = 12,
-		MAC_OS = 13,
-		XBOX = 14,
-		XBOX_360 = 15,
-		NEOGEO = 16,
-		NEOGEO_POCKET = 17,
-		NEOGEO_POCKET_COLOR = 18,
-		NINTENDO_3DS = 19,
-		NINTENDO_64 = 20,
-		NINTENDO_DS = 21,
-		NINTENDO_ENTERTAINMENT_SYSTEM = 22,
-		GAME_BOY = 23,
-		GAME_BOY_ADVANCE = 24,
-		GAME_BOY_COLOR = 25,
-		NINTENDO_GAMECUBE = 26,
-		NINTENDO_WII = 27,
-		NINTENDO_WII_U = 28,
-		PC = 29,
-		SEGA_32X = 30,
-		SEGA_CD = 31,
-		SEGA_DREAMCAST = 32,
-		SEGA_GAME_GEAR = 33,
-		SEGA_GENESIS = 34,
-		SEGA_MASTER_SYSTEM = 35,
-		SEGA_MEGA_DRIVE = 36,
-		SEGA_SATURN = 37,
-		PLAYSTATION = 38,
-		PLAYSTATION_2 = 39,
-		PLAYSTATION_3 = 40,
-		PLAYSTATION_4 = 41,
-		PLAYSTATION_VITA = 42,
-		PLAYSTATION_PORTABLE = 43,
-		SUPER_NINTENDO = 44,
-		TURBOGRAFX_16 = 45,
-		ZX_SPECTRUM = 46,
+		THREEDO, // name can't start with a constant
+		AMIGA,
+		APPLE_II,
+		ARCADE,
+		ATARI_800,
+		ATARI_2600,
+		ATARI_5200,
+		ATARI_7800,
+		ATARI_LYNX,
+		ATARI_ST, // Atari ST/STE/Falcon
+		ATARI_JAGUAR,
+		ATARI_JAGUAR_CD,
+		ATARI_XE,
+		COLECOVISION,
+		COMMODORE_64,
+		INTELLIVISION,
+		MAC_OS,
+		XBOX,
+		XBOX_360,
+		NEOGEO,
+		NEOGEO_POCKET,
+		NEOGEO_POCKET_COLOR,
+		NINTENDO_3DS,
+		NINTENDO_64,
+		NINTENDO_DS,
+		NINTENDO_ENTERTAINMENT_SYSTEM,
+		GAME_BOY,
+		GAME_BOY_ADVANCE,
+		GAME_BOY_COLOR,
+		NINTENDO_GAMECUBE,
+		NINTENDO_WII,
+		NINTENDO_WII_U,
+		PC,
+		SEGA_32X,
+		SEGA_CD,
+		SEGA_DREAMCAST,
+		SEGA_GAME_GEAR,
+		SEGA_GENESIS,
+		SEGA_MASTER_SYSTEM,
+		SEGA_MEGA_DRIVE,
+		SEGA_SATURN,
+		PLAYSTATION,
+		PLAYSTATION_2,
+		PLAYSTATION_3,
+		PLAYSTATION_4,
+		PLAYSTATION_VITA,
+		PLAYSTATION_PORTABLE,
+		SUPER_NINTENDO,
+		TURBOGRAFX_16, // (also PC Engine)
+		WONDERSWAN,
+		WONDERSWAN_COLOR,
+		ZX_SPECTRUM,
 
-		PLATFORM_IGNORE = 47, // do not allow scraping for this system
-		PLATFORM_COUNT = 48
+		PLATFORM_IGNORE, // do not allow scraping for this system
+		PLATFORM_COUNT
 	};
 
 	PlatformId getPlatformId(const char* str);
diff --git a/src/scrapers/GamesDBScraper.cpp b/src/scrapers/GamesDBScraper.cpp
index 1c8a6d325..d0630119e 100644
--- a/src/scrapers/GamesDBScraper.cpp
+++ b/src/scrapers/GamesDBScraper.cpp
@@ -19,6 +19,7 @@ const std::map<PlatformId, const char*> gamesdb_platformid_map = boost::assign::
 	(ATARI_7800, "Atari 7800")
 	(ATARI_JAGUAR, "Atari Jaguar")
 	(ATARI_JAGUAR_CD, "Atari Jaguar CD")
+	(ATARI_LYNX, "Atari Lynx")
 	(ATARI_XE, "Atari XE")
 	(COLECOVISION, "Colecovision")
 	(COMMODORE_64, "Commodore 64")
@@ -55,6 +56,8 @@ const std::map<PlatformId, const char*> gamesdb_platformid_map = boost::assign::
 	(PLAYSTATION_PORTABLE, "Sony PSP")
 	(SUPER_NINTENDO, "Super Nintendo (SNES)")
 	(TURBOGRAFX_16, "TurboGrafx 16")
+	(WONDERSWAN, "WonderSwan")
+	(WONDERSWAN_COLOR, "WonderSwan Color")
 	(ZX_SPECTRUM, "Sinclair ZX Spectrum");