diff --git a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
index 05e46d9..7465c05 100644
--- a/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
+++ b/FunKey/package/PCSX-ReARMed/PCSX-ReARMed.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PCSX_REARMED_VERSION = pcsx_rearmed-FunKey-1.2.2
+PCSX_REARMED_VERSION = v1.2.3-funkey-s
 PCSX_REARMED_SITE_METHOD = git
-PCSX_REARMED_SITE = https://github.com/FunKey-Project/pcsx_rearmed.git
+PCSX_REARMED_SITE = https://github.com/DrUm78/pcsx_rearmed.git
 PCSX_REARMED_LICENSE = GPL-2.0
 PCSX_REARMED_LICENSE_FILES = COPYING
 
diff --git a/FunKey/package/PocketSNES/PocketSNES.mk b/FunKey/package/PocketSNES/PocketSNES.mk
index 14dfab8..3dc7f7e 100644
--- a/FunKey/package/PocketSNES/PocketSNES.mk
+++ b/FunKey/package/PocketSNES/PocketSNES.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-POCKETSNES_VERSION = PocketSNES-FunKey-1.2.2
+POCKETSNES_VERSION = v1.3-funkey-s
 POCKETSNES_SITE_METHOD = git
-POCKETSNES_SITE = https://github.com/FunKey-Project/PocketSNES.git
+POCKETSNES_SITE = https://github.com/DrUm78/PocketSNES.git
 POCKETSNES_LICENSE = GPL-2.0
 POCKETSNES_LICENSE_FILES = COPYING
 
diff --git a/FunKey/package/gmenu2x/gmenu2x.mk b/FunKey/package/gmenu2x/gmenu2x.mk
index e99a797..1a5649d 100644
--- a/FunKey/package/gmenu2x/gmenu2x.mk
+++ b/FunKey/package/gmenu2x/gmenu2x.mk
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-GMENU2X_VERSION = gmenu2x-FunKey-1.0.4
+GMENU2X_VERSION = v1.0.5-funkey-s
 GMENU2X_SITE_METHOD = git
-GMENU2X_SITE = https://github.com/FunKey-Project/gmenu2x.git
+GMENU2X_SITE = https://github.com/DrUm78/gmenu2x.git
 GMENU2X_LICENSE = GPL-2.0
 
 GMENU2X_DEPENDENCIES = sdl sdl_ttf sdl_gfx dejavu libpng fonts-droid
diff --git a/FunKey/package/gpsp/gpsp.mk b/FunKey/package/gpsp/gpsp.mk
index 004fa32..3d7ad9c 100644
--- a/FunKey/package/gpsp/gpsp.mk
+++ b/FunKey/package/gpsp/gpsp.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-GPSP_VERSION = gpsp-FunKey-1.2.2
+GPSP_VERSION = v1.2.3-funkey-s
 GPSP_SITE_METHOD = git
-GPSP_SITE = https://github.com/FunKey-Project/gpsp.git
+GPSP_SITE = https://github.com/DrUm78/gpsp.git
 GPSP_LICENSE = GPL-2.0
 GPSP_LICENSE_FILES = COPYING.DOC
 
diff --git a/FunKey/package/picodrive/picodrive.mk b/FunKey/package/picodrive/picodrive.mk
index 5a5ffd9..cf1cb0b 100644
--- a/FunKey/package/picodrive/picodrive.mk
+++ b/FunKey/package/picodrive/picodrive.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PICODRIVE_VERSION = picodrive-FunKey-1.3.1
+PICODRIVE_VERSION = v1.4-funkey-s
 PICODRIVE_SITE_METHOD = git
-PICODRIVE_SITE = https://github.com/FunKey-Project/picodrive-irixxxx.git
+PICODRIVE_SITE = https://github.com/DrUm78/picodrive-funkey.git
 PICODRIVE_LICENSE = MAME
 PICODRIVE_LICENSE_FILES = COPYING