diff --git a/alleato-base/Makefile b/alleato-base/Makefile
index 546ef4c50..1136cee9b 100644
--- a/alleato-base/Makefile
+++ b/alleato-base/Makefile
@@ -12,7 +12,7 @@ PKG_MAINTAINER:=Martin Assarsson, ALLEATO
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/asterisk-1.8.x-mod/Makefile b/asterisk-1.8.x-mod/Makefile
index 0335f08c4..ab9ce5780 100644
--- a/asterisk-1.8.x-mod/Makefile
+++ b/asterisk-1.8.x-mod/Makefile
@@ -19,7 +19,7 @@ PKG_SOURCE_URL:=git@ihgsp.inteno.se:asterisk-aa
 endif
 
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)-$(PKG_RELEASE).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/brcm-h/Makefile b/brcm-h/Makefile
index fc4fa070c..0a0ffb669 100644
--- a/brcm-h/Makefile
+++ b/brcm-h/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=brcm-h
 PKG_VERSION:=1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=git@iopsys.inteno.se:brcm-h
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=HEAD
diff --git a/dahdi/Makefile b/dahdi/Makefile
index 3a2853bc8..c9f1c1232 100644
--- a/dahdi/Makefile
+++ b/dahdi/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=dahdi
 PKG_VERSION:=2.9.1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=git@iopsys.inteno.se:dahdi
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=HEAD
diff --git a/dect-prog/Makefile b/dect-prog/Makefile
index c02982591..2a0fac6d3 100644
--- a/dect-prog/Makefile
+++ b/dect-prog/Makefile
@@ -28,7 +28,7 @@ export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/dectmngr/Makefile b/dectmngr/Makefile
index d1297da89..755ef48b0 100644
--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -28,7 +28,7 @@ export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/dectmngr2/Makefile b/dectmngr2/Makefile
index 4e4999291..bb9499a8f 100644
--- a/dectmngr2/Makefile
+++ b/dectmngr2/Makefile
@@ -28,7 +28,7 @@ export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/endptcfg/Makefile b/endptcfg/Makefile
index 966950a72..d658caff8 100644
--- a/endptcfg/Makefile
+++ b/endptcfg/Makefile
@@ -14,7 +14,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git@iopsys.inteno.se:endptcfg
 PKG_SOURCE_VERSION:=1194b05278bd0945ca5c76436e56617b86871a65
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 LDFLAGS+= \
         -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
diff --git a/freecwmp/Makefile b/freecwmp/Makefile
index 35175193c..2937d194d 100644
--- a/freecwmp/Makefile
+++ b/freecwmp/Makefile
@@ -18,7 +18,7 @@ endif
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=63498b3929cc528a5bbf111f718ba7d4b3da5516
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 
diff --git a/goldfish-qemu/Makefile b/goldfish-qemu/Makefile
index e5b4083ea..7b02f15c4 100644
--- a/goldfish-qemu/Makefile
+++ b/goldfish-qemu/Makefile
@@ -12,7 +12,7 @@ PKG_REV:=2b8ea29e2bd12f876a4d06647e6077bf72de567e
 PKG_VERSION:=20090429
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=git://android.git.kernel.org/platform/external/qemu
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/icwmp/Makefile b/icwmp/Makefile
index 66d7617d2..6a03ad02b 100644
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -18,7 +18,7 @@ endif
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=18a54c6f464bc6ba7934172c5997edaa54a3ee9c
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 
diff --git a/natalie-dect-h/Makefile b/natalie-dect-h/Makefile
index bd7873aed..7dc5b452c 100644
--- a/natalie-dect-h/Makefile
+++ b/natalie-dect-h/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=natalie-dect-h
 PKG_VERSION:=11.19
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 ifeq ($(CONFIG_BCM_OPEN),y)
 PKG_SOURCE_URL:=http://ihgsp.inteno.se/git/natalie-dect-h
 else
diff --git a/natalie-dect/Makefile b/natalie-dect/Makefile
index 9d65f34da..3e411ef2f 100644
--- a/natalie-dect/Makefile
+++ b/natalie-dect/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=natalie-dect
 PKG_VERSION:=11.19.1
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=git@iopsys.inteno.se:natalie-dect-11.19
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=2015e8106c7d541dd038381c2845bd8462d74a30
diff --git a/owsip/Makefile b/owsip/Makefile
index 4dcf1efdf..8c9c65e8e 100644
--- a/owsip/Makefile
+++ b/owsip/Makefile
@@ -15,7 +15,7 @@ PKG_VERSION:=$(OWSIP_VERSION)$(if $(OWSIP_RELEASE),.$(OWSIP_RELEASE))
 PKG_RELEASE:=1
 PKG_REV:=da53a53db28b47ca1714ffba72d0df5bea357706
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=git://nbd.name/owsip.git
 PKG_SOURCE_SUBDIR:=owsip-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
diff --git a/ps3-utils/Makefile b/ps3-utils/Makefile
index 3d3ea1bef..042eb0e2f 100644
--- a/ps3-utils/Makefile
+++ b/ps3-utils/Makefile
@@ -12,7 +12,7 @@ PKG_REV:=6488134e48cf2d6f2d6471ced8346ac8cb1b855a
 PKG_VERSION:=20090320
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.bz2
 PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/geoff/ps3-utils.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
diff --git a/samba2/Makefile b/samba2/Makefile
index 609465e87..1a12f577a 100644
--- a/samba2/Makefile
+++ b/samba2/Makefile
@@ -21,7 +21,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=d687d07a137981f4fe78cc289b040e6426c61e29
 PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/shflags/Makefile b/shflags/Makefile
index b69f2bd33..13b629f7c 100644
--- a/shflags/Makefile
+++ b/shflags/Makefile
@@ -16,7 +16,7 @@ PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_URL:=http://shflags.googlecode.com/svn/trunk/
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/teliasafety-misc/Makefile b/teliasafety-misc/Makefile
index 2f5b6a39e..f756d9ae5 100644
--- a/teliasafety-misc/Makefile
+++ b/teliasafety-misc/Makefile
@@ -27,7 +27,7 @@ RSTRIP:=true
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ubus-mqtt/Makefile b/ubus-mqtt/Makefile
index 3b5afcae8..30b26bcee 100644
--- a/ubus-mqtt/Makefile
+++ b/ubus-mqtt/Makefile
@@ -14,7 +14,7 @@ PKG_RELEASE:=1
 PKG_SOURCE_URL:=git@iopsys.inteno.se:$(PKG_NAME).git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/usb-modeswitch/Makefile b/usb-modeswitch/Makefile
index e1bf6c771..2bde18933 100644
--- a/usb-modeswitch/Makefile
+++ b/usb-modeswitch/Makefile
@@ -11,7 +11,7 @@ PKG_NAME:=inteno-usb-modeswitch
 PKG_VERSION:=master
 PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/trevd/usb-modeswitch.git
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=$(PKG_VERSION)
diff --git a/voicesec/Makefile b/voicesec/Makefile
index 2597f6e61..2bc1bcc81 100644
--- a/voicesec/Makefile
+++ b/voicesec/Makefile
@@ -15,7 +15,7 @@ PKG_SOURCE_URL:=git@ihgsp.inteno.se:voicesec
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=661c0091e579e284712aeed892e921cc84a6f0bb
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
diff --git a/webgui/luci/luci/Makefile b/webgui/luci/luci/Makefile
index 6b9e8fa1f..10668c918 100644
--- a/webgui/luci/luci/Makefile
+++ b/webgui/luci/luci/Makefile
@@ -14,7 +14,7 @@ endif
 
 
 PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)-$(PKG_RELEASE).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_BUILD_DEPENDS:=$(if $(STAGING_DIR_ROOT),lua/host)