diff --git a/README.md b/README.md
index 38e7f7d1..8b65d19a 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,8 @@ $ sudo apt install build-essential qt5-default
 ```
 You might be asked for your sudo password. On RetroPie the default password is `raspberry`. To install Qt5 on other Linux distributions, please refer to their documentation.
 
+NOTE! Ubuntu 21.04 hasn't added the `qt5-default` metapackage yet. For this version you will have to do `sudo apt install build-essential qtbase5-dev qt5-qmake qtbase5-dev-tools` which installs the same as the above command.
+
 #### macOS
 Skyscraper works perfectly on macOS as well but is not officially supported as I don't own a Mac. But with the help of HoraceAndTheSpider and abritinthebay here's the commands needed to install the Qt5 and other prerequisites:
 ```
@@ -42,7 +44,9 @@ $ brew link qt5 --force
 ```
 If that went well, proceed to the default installation instructions below. It should work and give you a working installation of Skyscraper.
 
-NOTE! User 'davidmgrantham' reports that the `--with-default-names` above might be deprecated for some macOS installations. If you remove it, you also need to download the `update_skyscraper.sh` and edit the `tar` commands to be `gtar` before running it.
+NOTE 1! User 'davidmgrantham' reports that the `--with-default-names` above might be deprecated for some macOS installations. If you remove it, you also need to download the `update_skyscraper.sh` and edit the `tar` commands to be `gtar` before running it.
+
+NOTE 2! User 'trvrplk' reports numerous issues on MacOS 11.2+. Check [here](https://github.com/muldjord/skyscraper/issues/301) for potential fixes.
 
 ### Download, compile and install
 When you've installed the prerequisites as described above, you can install Skyscraper by typing in the following commands:
@@ -155,8 +159,9 @@ NOTE: If you choose to use this mode, please be aware that many of the scraping
 * Add support for grouping multi-disk games so they only have one entry in the gamelists. See issues/232 (Thank you to 'igno2k' for suggesting this)
 * Add 'service check' to verify API status of online source before starting scraping run.
 
-#### Version 3.6.11 (In progress, unreleased)
+#### Version 3.6.11 (6th May 2021)
 * '--fromfile' now accepts both relative and absolute path to filename (Thank you to user 'sleve_mcdichael' for reporting this)
+* Added platforms 'atarijaguarcd', 'pcenginecd' and 'channelf' (Thank you to user 'XenuIsWatching' for providing info)
 
 #### Version 3.6.10 (12th April 2021)
 * Added 'naomi' as platform
diff --git a/docs/PLATFORMS.md b/docs/PLATFORMS.md
index 7759f65a..9cb95aea 100644
--- a/docs/PLATFORMS.md
+++ b/docs/PLATFORMS.md
@@ -13,6 +13,7 @@ As Skyscraper was built to be used with RetroPie, the list of supported platform
 * Atari5200
 * Atari7800
 * Atari Jaguar
+* Atari Jaguar CD
 * Atari Lynx
 * Atari ST
 * AtomisWave
@@ -24,6 +25,7 @@ As Skyscraper was built to be used with RetroPie, the list of supported platform
 * Dragon 32/64
 * Dreamcast
 * Emerson Arcadia 2001
+* Fairchild Channel F
 * Famicom Disk System
 * FB Neo (formerly FB Alpha)
 * Game Boy
@@ -48,6 +50,7 @@ As Skyscraper was built to be used with RetroPie, the list of supported platform
 * PC-8800
 * PC-9800
 * PC-Engine / TurboGrafx-16
+* PC-Engine CD / TurboGrafx-16 CD
 * PC-FX
 * Playstation
 * Playstation 2
diff --git a/src/platform.cpp b/src/platform.cpp
index f8df1ae6..e9d5343d 100644
--- a/src/platform.cpp
+++ b/src/platform.cpp
@@ -55,12 +55,14 @@ QStringList Platform::getPlatforms()
   platforms.append("atari5200");
   platforms.append("atari7800");
   platforms.append("atarijaguar");
+  platforms.append("atarijaguarcd");
   platforms.append("atarilynx");
   platforms.append("atarist");
   platforms.append("atomiswave");
   platforms.append("c16");
   platforms.append("c64");
   platforms.append("c128");
+  platforms.append("channelf");
   platforms.append("coco");
   platforms.append("coleco");
   platforms.append("daphne");
@@ -99,6 +101,7 @@ QStringList Platform::getPlatforms()
   platforms.append("pc98");
   platforms.append("pcfx");
   platforms.append("pcengine");
+  platforms.append("pcenginecd");
   platforms.append("pokemini");
   platforms.append("ports");
   platforms.append("ps2");
@@ -164,6 +167,8 @@ QStringList Platform::getScrapers(QString platform)
     scrapers.append("screenscraper");
   } else if(platform == "atarijaguar") {
     scrapers.append("screenscraper");
+  } else if(platform == "atarijaguarcd") {
+    scrapers.append("screenscraper");
   } else if(platform == "atarilynx") {
     scrapers.append("screenscraper");
   } else if(platform == "atarist") {
@@ -176,6 +181,8 @@ QStringList Platform::getScrapers(QString platform)
     scrapers.append("screenscraper");
   } else if(platform == "c128") {
     scrapers.append("screenscraper");
+  } else if(platform == "channelf") {
+    scrapers.append("screenscraper");
   } else if(platform == "coco") {
     scrapers.append("screenscraper");
   } else if(platform == "coleco") {
@@ -257,6 +264,8 @@ QStringList Platform::getScrapers(QString platform)
     scrapers.append("screenscraper");
   } else if(platform == "pcengine") {
     scrapers.append("screenscraper");
+  } else if(platform == "pcenginecd") {
+    scrapers.append("screenscraper");
   } else if(platform == "pokemini") {
     scrapers.append("screenscraper");
   } else if(platform == "ports") {
@@ -366,6 +375,8 @@ QString Platform::getFormats(QString platform, QString extensions, QString addEx
     formats.append("*.a78 *.bin");
   } else if(platform == "atarijaguar") {
     formats.append("*.j64 *.jag");
+  } else if(platform == "atarijaguarcd") {
+    formats.append("*.j64 *.jag *.cue *.chd");
   } else if(platform == "atarilynx") {
     formats.append("*.lnx");
   } else if(platform == "atarist") {
@@ -378,6 +389,8 @@ QString Platform::getFormats(QString platform, QString extensions, QString addEx
     formats.append("*.crt *.d64 *.prg *.tap *.t64 *.g64 *.x64 *.vsf");
   } else if(platform == "c128") {
     formats.append("*.crt *.d64 *.prg *.tap *.t64 *.g64 *.x64 *.vsf");
+  } else if(platform == "channelf") {
+    formats.append("*.bin *.rom");
   } else if(platform == "coco") {
     formats.append("*.cas *.wav *.bas *.asc *.dmk *.jvc *.os9 *.dsk *.vdk *.rom *.ccc *.sna");
   } else if(platform == "coleco") {
@@ -454,6 +467,8 @@ QString Platform::getFormats(QString platform, QString extensions, QString addEx
     formats.append("*.img *.iso *.ccd *.cue");
   } else if(platform == "pcengine") {
     formats.append("*.pce *.chd *.cue");
+  } else if(platform == "pcenginecd") {
+    formats.append("*.pce *.chd *.cue");
   } else if(platform == "pokemini") {
     formats.append("*.min");
   } else if(platform == "ports") {
@@ -542,6 +557,8 @@ QString Platform::getDefaultScraper(QString platform)
     scraper = "cache";
   } else if(platform == "atarijaguar") {
     scraper = "cache";
+  } else if(platform == "atarijaguarcd") {
+    scraper = "cache";
   } else if(platform == "atarilynx") {
     scraper = "cache";
   } else if(platform == "atarist") {
@@ -554,6 +571,8 @@ QString Platform::getDefaultScraper(QString platform)
     scraper = "cache";
   } else if(platform == "c128") {
     scraper = "cache";
+  } else if(platform == "channelf") {
+    scraper = "cache";
   } else if(platform == "coco") {
     scraper = "cache";
   } else if(platform == "coleco") {
@@ -630,6 +649,8 @@ QString Platform::getDefaultScraper(QString platform)
     scraper = "cache";
   } else if(platform == "pcengine") {
     scraper = "cache";
+  } else if(platform == "pcenginecd") {
+    scraper = "cache";
   } else if(platform == "pokemini") {
     scraper = "cache";
   } else if(platform == "ports") {
@@ -802,6 +823,11 @@ QStringList Platform::getAliases(QString platform)
   } else if(platform == "atarijaguar") {
     aliases.append("atari jaguar");
     aliases.append("jaguar");
+  } else if(platform == "atarijaguarcd") {
+    aliases.append("atari jaguar");
+    aliases.append("jaguar");
+    aliases.append("atari jaguar cd");
+    aliases.append("jaguar cd");
   } else if(platform == "atarilynx") {
     aliases.append("atari lynx");
     aliases.append("lynx");
@@ -880,6 +906,9 @@ QStringList Platform::getAliases(QString platform)
     aliases.append("amiga cd32 (hack)");
   } else if(platform == "cdtv") {
     aliases.append("amiga cdtv");
+  } else if(platform == "channelf") {
+    aliases.append("fairchild channel f");
+    aliases.append("channel f");
   } else if(platform == "coco") {
     aliases.append("trs-80 color computer");
     aliases.append("trs-80 coco");
@@ -1341,6 +1370,15 @@ QStringList Platform::getAliases(QString platform)
     aliases.append("pc engine");
     aliases.append("pc engine cd-rom");
     aliases.append("pc engine supergrafx");
+  } else if(platform == "pcenginecd") {
+    aliases.append("turbografx 16");
+    aliases.append("turbografx cd");
+    aliases.append("turbografx-16");
+    aliases.append("turbografx-16/pc engine");
+    aliases.append("turbografx-16/pc engine cd");
+    aliases.append("pc engine");
+    aliases.append("pc engine cd-rom");
+    aliases.append("pc engine supergrafx");
   } else if(platform == "pokemini") {
     aliases.append("nintendo pokémon mini");
     aliases.append("pokémon mini");
diff --git a/src/screenscraper.cpp b/src/screenscraper.cpp
index 25ac2c69..010a21d0 100644
--- a/src/screenscraper.cpp
+++ b/src/screenscraper.cpp
@@ -658,6 +658,8 @@ QString ScreenScraper::getPlatformId(const QString platform)
     return "41";
   } else if(platform == "atarijaguar") {
     return "27";
+  } else if(platform == "atarijaguarcd") {
+    return "171";
   } else if(platform == "atarilynx") {
     return "28";
   } else if(platform == "atarist") {
@@ -670,6 +672,8 @@ QString ScreenScraper::getPlatformId(const QString platform)
     return "66";
   } else if(platform == "c128") {
     return "na";
+  } else if(platform == "channelf") {
+    return "80";
   } else if(platform == "coco") {
     return "144";
   } else if(platform == "coleco") {
@@ -746,6 +750,8 @@ QString ScreenScraper::getPlatformId(const QString platform)
     return "72";
   } else if(platform == "pcengine") {
     return "31";
+  } else if(platform == "pcenginecd") {
+    return "114";
   } else if(platform == "pokemini") {
     return "211";
   } else if(platform == "ports") {