diff --git a/abusehelper/Makefile b/abusehelper/Makefile
index f496582..ceb4777 100644
--- a/abusehelper/Makefile
+++ b/abusehelper/Makefile
@@ -1,11 +1,11 @@
 include $(CURDIR)/../Makefile.inc
 
 AHBRANCH = master
-AHSOURCE = https://bitbucket.org/clarifiednetworks/abusehelper/get/$(AHBRANCH).tar.gz
+AHSOURCE = https://github.com/abusesa/abusehelper/archive/$(AHBRANCH).tar.gz
 AHTARGET = abusehelper-$(AHBRANCH)-$(TIMESTAMP).tar.gz
 
 IKBRANCH = master
-IKSOURCE = https://bitbucket.org/clarifiednetworks/idiokit/get/$(IKBRANCH).tar.gz
+IKSOURCE = https://github.com/abusesa/idiokit/archive/$(IKBRANCH).tar.gz
 IKTARGET = idiokit-$(IKBRANCH)-$(TIMESTAMP).tar.gz
 
 all:      tarball manifest
@@ -14,11 +14,11 @@ manifest: $(MANIFESTS)/abusehelper.pp
 
 $(PACKAGES)/$(AHTARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -f -o $@ $(AHSOURCE)
+	test -f $@ || curl -L -f -o $@ $(AHSOURCE)
 
 $(PACKAGES)/$(IKTARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -f -o $@ $(IKSOURCE)
+	test -f $@ || curl -L -f -o $@ $(IKSOURCE)
 
 $(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET)
 	@umask 022; echo $@; \