diff --git a/Makefile b/Makefile
index 12d653f..b51d487 100644
--- a/Makefile
+++ b/Makefile
@@ -47,8 +47,7 @@ bin/%:	$(PROJECT_FILES)
 	$(CGO_FLAGS) GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o ./tools/$(GOOS)-$(GOARCH)/cryptogen -tags "$(GO_TAGS)" -ldflags "$(GO_LDFLAGS)" github.com/hyperledger/fabric/common/tools/cryptogen
 	rsync -rupE templates/ bin/$(GOOS)-$(GOARCH)/templates
 	rsync -rupE tools/$(GOOS)-$(GOARCH) bin/$(GOOS)-$(GOARCH)/tools
-	cd $(@D) && tar czf ../../downloadable/netcomposer-$(GOOS)-$(GOARCH).tar.gz .
+	cd $(@D) && tar czf ../../bin/netcomposer-$(GOOS)-$(GOARCH).tar.gz .
 
 clean:
-	@rm -rf downloadable/*
 	@rm -rf bin
diff --git a/downloadable/netcomposer-darwin-amd64.tar.gz b/downloadable/netcomposer-darwin-amd64.tar.gz
deleted file mode 100644
index 28a2ea1..0000000
Binary files a/downloadable/netcomposer-darwin-amd64.tar.gz and /dev/null differ
diff --git a/downloadable/netcomposer-linux-amd64.tar.gz b/downloadable/netcomposer-linux-amd64.tar.gz
deleted file mode 100644
index 40f9c96..0000000
Binary files a/downloadable/netcomposer-linux-amd64.tar.gz and /dev/null differ
diff --git a/downloadable/netcomposer-linux-ppc64le.tar.gz b/downloadable/netcomposer-linux-ppc64le.tar.gz
deleted file mode 100644
index 568e93d..0000000
Binary files a/downloadable/netcomposer-linux-ppc64le.tar.gz and /dev/null differ
diff --git a/downloadable/netcomposer-linux-s390x.tar.gz b/downloadable/netcomposer-linux-s390x.tar.gz
deleted file mode 100644
index 3a0289c..0000000
Binary files a/downloadable/netcomposer-linux-s390x.tar.gz and /dev/null differ
diff --git a/downloadable/netcomposer-windows-amd64.tar.gz b/downloadable/netcomposer-windows-amd64.tar.gz
deleted file mode 100644
index e211697..0000000
Binary files a/downloadable/netcomposer-windows-amd64.tar.gz and /dev/null differ