diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb2ad83b14a09644d391bab4179fe3a8557ebf9a..c57baf663d9b23b148acce3b0d7451b0c821d9ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ All notable changes to this project will be documented in this file.
 - Fix hiding a game wipe all its metadata
 - Fix theme swithing & theme option edition
 - Improved .cue/.gdi/.m3u subfile detection
+- Added Swanstation libretro core on rpi2 and rpi1/0
 
 ## [7.2-Reloaded]
 - Bump libretro-mame
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index b729cfd162a02573a56991a90b31368c2ac71f56..4454865140482d7bc8594d169f2cae0a5792f2ab 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -31,6 +31,7 @@
 - Fix hiding a game wipe all its metadata
 - Fix theme display after switching theme or editing theme options
 - Fix some files referenced in .cue/.gdi/.m3u not being ignored by the scraper
+- Swanstation has been added on rpi2 and rpi1
 
 ## 7.2-Reloaded
 
diff --git a/TESTING.md b/TESTING.md
index 2047fcac9534353f2b37ccbb9adbc316465b34f2..5dbe35336afe49d4ac6d32fd484fa52c993f8b46 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -12,6 +12,7 @@ Toutes les cases doivent être cochées avant la release stable.
 Pour les pending features, elles ne seront activées que si les beta testeurs les valident selon les critères de qualité de Recalbox.
 
 ## [7.2.1-Reloaded]
+- [ ] Test swanstation performance on rpi2 and rpi1/0
 - [ ] Switch one theme option, then cancel the ES reboot. Leave the menu. Enter the option menu again. Switch another option and let ES to reboot. Then check both options are OK
 - [ ] Switch one theme option, let ES to reboot, then check if the option is ok
 - [ ] Switch theme and let ES to reboot, then check the theme is displayed properly
diff --git a/configs/recalbox-rpi1_defconfig b/configs/recalbox-rpi1_defconfig
index cb8e9bc2d58e763ad90251cae73781ba74b7a13d..0e9d0bbced23b433b03bfb4a31b55f190e98dd70 100644
--- a/configs/recalbox-rpi1_defconfig
+++ b/configs/recalbox-rpi1_defconfig
@@ -302,6 +302,7 @@ BR2_PACKAGE_LIBRETRO_TGBDUAL=y
 BR2_PACKAGE_LIBRETRO_THEODORE=y
 BR2_PACKAGE_LIBRETRO_TIC80=y
 BR2_PACKAGE_LIBRETRO_TYRQUAKE=y
+BR2_PACKAGE_LIBRETRO_SWANSTATION=y
 BR2_PACKAGE_LIBRETRO_UZEM=y
 BR2_PACKAGE_LIBRETRO_VECX=y
 BR2_PACKAGE_LIBRETRO_VICE=y
diff --git a/configs/recalbox-rpi2_defconfig b/configs/recalbox-rpi2_defconfig
index 295e37c96b6a2ef702fbe6e577e3112633c01cb3..17e84aa34b20fcd4894b2c8fa96eea7daf716478 100644
--- a/configs/recalbox-rpi2_defconfig
+++ b/configs/recalbox-rpi2_defconfig
@@ -316,6 +316,7 @@ BR2_PACKAGE_LIBRETRO_TGBDUAL=y
 BR2_PACKAGE_LIBRETRO_THEODORE=y
 BR2_PACKAGE_LIBRETRO_TIC80=y
 BR2_PACKAGE_LIBRETRO_TYRQUAKE=y
+BR2_PACKAGE_LIBRETRO_SWANSTATION=y
 BR2_PACKAGE_LIBRETRO_UAE=y
 BR2_PACKAGE_LIBRETRO_UZEM=y
 BR2_PACKAGE_LIBRETRO_VECX=y