diff --git a/feeds.conf.default b/feeds.conf.default
index 7b63a9ff8d..4f0c992cdc 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,10 +1,9 @@
-src-svn packages svn://svn.openwrt.org/openwrt/packages
-src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
+src-git packages git://github.com/openwrt/packages.git
 src-git luci git://nbd.name/luci.git
 src-git routing git://github.com/openwrt-routing/packages.git
-src-git telephony http://feeds.openwrt.nanl.de/openwrt/telephony.git
-#src-svn luci http://svn.luci.subsignal.org/luci/trunk/contrib/package
-#src-svn luci http://nprove:nprovedev@fongui.wgaugsburg.de/luci/trunk/contrib/package
+src-git telephony git://git.openwrt.org/feed/telephony.git
+src-git oldpackages http://git.openwrt.org/packages.git
+src-git xwrt git://github.com/stgerrard008/OpenWRT-missing-file.git
 #src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
 #src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
 #src-svn xorg svn://svn.openwrt.org/openwrt/feeds/xorg
diff --git a/package/hotplug2/Makefile b/package/hotplug2/Makefile
index 0746d18816..8139bf1f4a 100644
--- a/package/hotplug2/Makefile
+++ b/package/hotplug2/Makefile
@@ -12,10 +12,11 @@ PKG_REV:=201
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=4
 
-PKG_SOURCE_PROTO:=svn
+#PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=hotplug2-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://svn.nomi.cz/svn/isteve/hotplug2
+PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)
+#PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
+PKG_SOURCE_URL:=https://github.com/stgerrard008/OpenWRT-missing-file/raw/master/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
 #PKG_SOURCE_URL:=http://isteve.bofh.cz/~isteve/hotplug2
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 467c93494e..50759fac26 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=2.66
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
+PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq/archive/
 PKG_MD5SUM:=c5eb8fb88847a5e9bf18db67c74efd47
 
 PKG_LICENSE:=GPLv2
@@ -29,7 +29,7 @@ define Package/dnsmasq/Default
   SECTION:=net
   CATEGORY:=Base system
   TITLE:=A lightweight DNS and DHCP server
-  URL:=http://www.thekelleys.org.uk/dnsmasq/
+  URL:=http://www.thekelleys.org.uk/dnsmasq/archive/
 endef
 
 define Package/dnsmasq
diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile
index ff80df4111..0b98327361 100644
--- a/package/network/utils/iproute2/Makefile
+++ b/package/network/utils/iproute2/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=3.9.0
 PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/
+PKG_SOURCE_URL:=https://www.kernel.org/pub/linux/utils/net/iproute2/
 PKG_MD5SUM:=b53376db94c8d66f9d540c69ed84f13b
 PKG_BUILD_PARALLEL:=1
 
diff --git a/package/opkg/Makefile b/package/opkg/Makefile
index 6407ab451f..f069c855ce 100644
--- a/package/opkg/Makefile
+++ b/package/opkg/Makefile
@@ -13,10 +13,11 @@ PKG_REV:=618
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=3
 
-PKG_SOURCE_PROTO:=svn
+#PKG_SOURCE_PROTO:=svn
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION)
-PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
+#PKG_SOURCE_URL:=http://opkg.googlecode.com/svn/trunk/
+PKG_SOURCE_URL:=https://github.com/stgerrard008/OpenWRT-missing-file/raw/master/
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz
 PKG_FIXUP:=autoreconf
 PKG_REMOVE_FILES = autogen.sh aclocal.m4
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index a74a6c234c..2006c2473d 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -17,7 +17,8 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=linux
 PKG_VERSION:=$(LINUX_VERSION)
 PKG_SOURCE:=$(LINUX_SOURCE)
-PKG_SOURCE_URL:=$(LINUX_SITE)
+#PKG_SOURCE_URL:=$(LINUX_SITE)
+PKG_SOURCE_URL:=https://www.kernel.org/pub/linux/kernel/v2.6/
 HOST_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)
 PKG_MD5SUM:=$(LINUX_KERNEL_MD5SUM)
 LINUX_DIR := $(HOST_BUILD_DIR)