diff --git a/abusesa/Makefile b/abusesa/Makefile
index 582d317..901e588 100644
--- a/abusesa/Makefile
+++ b/abusesa/Makefile
@@ -2,13 +2,13 @@ include $(CURDIR)/../Makefile.inc
 
 BRANCH = master
 
-SOURCE = https://bitbucket.org/codenomicon/abusesa/get/$(BRANCH).tar.gz
+SOURCE = https://github.com/abusesa/abusesa/archive/$(BRANCH).tar.gz
 TARGET = abusesa-$(BRANCH)-$(TIMESTAMP).tar.gz
 
-PASSIVEDNSSOURCE = https://bitbucket.org/codenomicon/abusesa-passivedns/get/$(BRANCH).tar.gz
+PASSIVEDNSSOURCE = https://github.com/abusesa/passivedns/archive/$(BRANCH).tar.gz
 PASSIVEDNSTARGET = abusesa-passivedns-$(BRANCH)-$(TIMESTAMP).tar.gz
 
-SEARCHSOURCE = https://bitbucket.org/codenomicon/abusesa-search/get/$(BRANCH).tar.gz
+SEARCHSOURCE = https://github.com/abusesa/search/archive/$(BRANCH).tar.gz
 SEARCHTARGET = abusesa-search-$(BRANCH)-$(TIMESTAMP).tar.gz
 
 all:      tarball manifest
@@ -25,7 +25,7 @@ searchmanifest: $(MANIFESTS)/abusesa_search.pp
 
 $(PACKAGES)/$(TARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -f --basic -u $(USER) -o $@ $(SOURCE)
+	test -f $@ || curl -L -f --basic -u $(USER) -o $@ $(SOURCE)
 
 $(MANIFESTS)/abusesa.pp: $(PACKAGES)/$(TARGET)
 	@umask 022; echo $@; \
@@ -33,7 +33,7 @@ $(MANIFESTS)/abusesa.pp: $(PACKAGES)/$(TARGET)
 
 $(PACKAGES)/$(PASSIVEDNSTARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -f --basic -u $(USER) -o $@ $(PASSIVEDNSSOURCE)
+	test -f $@ || curl -L -f --basic -u $(USER) -o $@ $(PASSIVEDNSSOURCE)
 
 $(MANIFESTS)/abusesa_passivedns.pp: $(PACKAGES)/$(PASSIVEDNSTARGET)
 	@umask 022; echo $@; \
@@ -41,7 +41,7 @@ $(MANIFESTS)/abusesa_passivedns.pp: $(PACKAGES)/$(PASSIVEDNSTARGET)
 
 $(PACKAGES)/$(SEARCHTARGET):
 	@umask 022; echo $@; \
-	test -f $@ || curl -f --basic -u $(USER) -o $@ $(SEARCHSOURCE)
+	test -f $@ || curl -L -f --basic -u $(USER) -o $@ $(SEARCHSOURCE)
 
 $(MANIFESTS)/abusesa_search.pp: $(PACKAGES)/$(SEARCHTARGET)
 	@umask 022; echo $@; \