diff --git a/libs/json-glib/Makefile b/libs/json-glib/Makefile
index 908513e9dc..0732792a7e 100644
--- a/libs/json-glib/Makefile
+++ b/libs/json-glib/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.6.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/json-glib/1.6
+PKG_SOURCE_URL:=@GNOME/json-glib/$(basename $(PKG_VERSION))
 PKG_HASH:=96ec98be7a91f6dde33636720e3da2ff6ecbb90e76ccaa49497f31a6855a490e
 
 PKG_LICENSE:=LGPL-2.1-or-later
diff --git a/libs/libgee/Makefile b/libs/libgee/Makefile
index b7dbabdade..66e6bbf052 100644
--- a/libs/libgee/Makefile
+++ b/libs/libgee/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=0.20.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/libgee/0.20
+PKG_SOURCE_URL:=@GNOME/libgee/$(basename $(PKG_VERSION))
 PKG_HASH:=1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
diff --git a/libs/libsoup/Makefile b/libs/libsoup/Makefile
index 6c87fdb11b..fd3edbbf14 100644
--- a/libs/libsoup/Makefile
+++ b/libs/libsoup/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=2.74.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.74
+PKG_SOURCE_URL:=@GNOME/libsoup/$(basename $(PKG_VERSION))
 PKG_HASH:=e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
diff --git a/libs/libsoup3/Makefile b/libs/libsoup3/Makefile
index 846d85d81a..fb864644e5 100644
--- a/libs/libsoup3/Makefile
+++ b/libs/libsoup3/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=3.4.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=libsoup-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/libsoup/3.4
+PKG_SOURCE_URL:=@GNOME/libsoup/$(basename $(PKG_VERSION))
 PKG_HASH:=78c8fa37cb152d40ec8c4a148d6155e2f6947f3f1602a7cda3a31ad40f5ee2f3
 PKG_BUILD_DIR:=$(BUILD_DIR)/libsoup-$(PKG_VERSION)
 
diff --git a/libs/totem-pl-parser/Makefile b/libs/totem-pl-parser/Makefile
index 08a56b669e..626d41232a 100644
--- a/libs/totem-pl-parser/Makefile
+++ b/libs/totem-pl-parser/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=3.26.6
 PKG_RELEASE:=1
 
 PKG_SOURCE:=totem-pl-parser-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://download.gnome.org/sources/totem-pl-parser/3.26/
+PKG_SOURCE_URL:=@GNOME/totem-pl-parser/$(basename $(PKG_VERSION))
 PKG_HASH:=c0df0f68d5cf9d7da43c81c7f13f11158358368f98c22d47722f3bd04bd3ac1c
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
diff --git a/multimedia/grilo-plugins/Makefile b/multimedia/grilo-plugins/Makefile
index 616f34643f..f03e4415b5 100644
--- a/multimedia/grilo-plugins/Makefile
+++ b/multimedia/grilo-plugins/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=0.3.16
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/grilo-plugins/0.3/
+PKG_SOURCE_URL:=@GNOME/grilo-plugins/$(basename $(PKG_VERSION))
 PKG_HASH:=fe6f4dbe586c6b8ba2406394e202f22d009d642a96eb3a54f32f6a21d084cdcb
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
diff --git a/multimedia/grilo/Makefile b/multimedia/grilo/Makefile
index 088835074c..966adc56b5 100644
--- a/multimedia/grilo/Makefile
+++ b/multimedia/grilo/Makefile
@@ -10,7 +10,7 @@ PKG_VERSION:=0.3.16
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=@GNOME/grilo/0.3/
+PKG_SOURCE_URL:=@GNOME/grilo/$(basename $(PKG_VERSION))
 PKG_HASH:=884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>