diff --git a/Makefile b/Makefile
index cbe7657d..34e737ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-SOURCE ?= file go-bindata github
-DATABASE ?= postgres mysql
+SOURCE ?= file go-bindata github aws-s3 google-cloud-storage
+DATABASE ?= postgres mysql redshift
 VERSION ?= $(shell git describe --tags 2>/dev/null | cut -c 2-)
 TEST_FLAGS ?=
 REPO_OWNER ?= $(shell cd .. && basename "$$(pwd)")
@@ -59,6 +59,8 @@ html-coverage:
 deps:
 	-go get -v -u ./... 
 	-go test -v -i ./...
+	# TODO: why is this not being fetched with the command above?
+	-go get -u github.com/fsouza/fake-gcs-server/fakestorage
 
 
 list-external-deps:
diff --git a/cli/build_aws-s3.go b/cli/build_aws-s3.go
new file mode 100644
index 00000000..766fd566
--- /dev/null
+++ b/cli/build_aws-s3.go
@@ -0,0 +1,7 @@
+// +build aws-s3
+
+package main
+
+import (
+	_ "github.com/mattes/migrate/source/aws-s3"
+)
diff --git a/cli/build_google-cloud-storage.go b/cli/build_google-cloud-storage.go
new file mode 100644
index 00000000..04f31433
--- /dev/null
+++ b/cli/build_google-cloud-storage.go
@@ -0,0 +1,7 @@
+// +build google-cloud-storage
+
+package main
+
+import (
+	_ "github.com/mattes/migrate/source/google-cloud-storage"
+)
diff --git a/cli/build_ql.go b/cli/build_ql.go
new file mode 100644
index 00000000..cd56ef95
--- /dev/null
+++ b/cli/build_ql.go
@@ -0,0 +1,7 @@
+// +build ql
+
+package main
+
+import (
+	_ "github.com/mattes/migrate/database/ql"
+)