diff --git a/deps/rabbitmq_auth_mechanism_ssl/rabbitmq-components.mk b/deps/rabbitmq_auth_mechanism_ssl/rabbitmq-components.mk
index 8a3123de2e..11e2edafbd 100644
--- a/deps/rabbitmq_auth_mechanism_ssl/rabbitmq-components.mk
+++ b/deps/rabbitmq_auth_mechanism_ssl/rabbitmq-components.mk
@@ -34,6 +34,7 @@ dep_rabbitmq_auth_backend_ldap        = git_rmq rabbitmq-auth-backend-ldap $(cur
 dep_rabbitmq_auth_mechanism_ssl       = git_rmq rabbitmq-auth-mechanism-ssl $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_codegen                  = git_rmq rabbitmq-codegen $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_consistent_hash_exchange = git_rmq rabbitmq-consistent-hash-exchange $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_delayed_message_exchange = git_rmq rabbitmq-delayed-message-exchange $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_dotnet_client            = git_rmq rabbitmq-dotnet-client $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_federation               = git_rmq rabbitmq-federation $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_federation_management    = git_rmq rabbitmq-federation-management $(current_rmq_ref) $(base_rmq_ref)
@@ -43,6 +44,7 @@ dep_rabbitmq_management_agent         = git_rmq rabbitmq-management-agent $(curr
 dep_rabbitmq_management_visualiser    = git_rmq rabbitmq-management-visualiser $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_metronome                = git_rmq rabbitmq-metronome $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_mqtt                     = git_rmq rabbitmq-mqtt $(current_rmq_ref) $(base_rmq_ref)
+dep_rabbitmq_sharding                 = git_rmq rabbitmq-sharding $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_shovel                   = git_rmq rabbitmq-shovel $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_shovel_management        = git_rmq rabbitmq-shovel-management $(current_rmq_ref) $(base_rmq_ref)
 dep_rabbitmq_stomp                    = git_rmq rabbitmq-stomp $(current_rmq_ref) $(base_rmq_ref)
@@ -56,6 +58,8 @@ dep_rabbitmq_website                  = git_rmq rabbitmq-website $(current_rmq_r
 dep_sockjs                            = git_rmq sockjs-erlang $(current_rmq_ref) $(base_rmq_ref)
 dep_toke                              = git_rmq toke $(current_rmq_ref) $(base_rmq_ref)
 
+dep_rabbitmq_public_umbrella          = git_rmq rabbitmq-public-umbrella $(current_rmq_ref) $(base_rmq_ref)
+
 # FIXME: As of 2015-11-20, we depend on Ranch 1.2.0, but erlang.mk
 # defaults to Ranch 1.1.0. All projects depending indirectly on Ranch
 # needs to add "ranch" as a BUILD_DEPS. The list of projects needing
@@ -71,6 +75,7 @@ RABBITMQ_COMPONENTS = amqp_client \
 		      rabbitmq_auth_mechanism_ssl \
 		      rabbitmq_codegen \
 		      rabbitmq_consistent_hash_exchange \
+		      rabbitmq_delayed_message_exchange \
 		      rabbitmq_dotnet_client \
 		      rabbitmq_federation \
 		      rabbitmq_federation_management \
@@ -80,6 +85,7 @@ RABBITMQ_COMPONENTS = amqp_client \
 		      rabbitmq_management_visualiser \
 		      rabbitmq_metronome \
 		      rabbitmq_mqtt \
+		      rabbitmq_sharding \
 		      rabbitmq_shovel \
 		      rabbitmq_shovel_management \
 		      rabbitmq_stomp \
@@ -137,16 +143,20 @@ export base_rmq_ref
 rmq_cmp_repo_name = $(word 2,$(dep_$(1)))
 
 # Upstream URL for the current project.
-RABBITMQ_COMPONENT_REPO_NAME = $(call rmq_cmp_repo_name,$(PROJECT))
-RABBITMQ_UPSTREAM_REPO ?= https://github.com/rabbitmq/$(RABBITMQ_COMPONENT_REPO_NAME).git
+RABBITMQ_COMPONENT_REPO_NAME := $(call rmq_cmp_repo_name,$(PROJECT))
+RABBITMQ_UPSTREAM_FETCH_URL ?= https://github.com/rabbitmq/$(RABBITMQ_COMPONENT_REPO_NAME).git
+RABBITMQ_UPSTREAM_PUSH_URL ?= git@github.com:rabbitmq/$(RABBITMQ_COMPONENT_REPO_NAME).git
 
 # Current URL for the current project. If this is not a Git clone,
 # default to the upstream Git repository.
 ifneq ($(wildcard .git),)
-git_origin_repo_url := $(shell git config remote.origin.url)
-RABBITMQ_CURRENT_REPO ?= $(git_origin_repo_url)
+git_origin_fetch_url := $(shell git config remote.origin.url)
+git_origin_push_url := $(shell git config remote.origin.pushurl)
+RABBITMQ_CURRENT_FETCH_URL ?= $(git_origin_fetch_url)
+RABBITMQ_CURRENT_PUSH_URL ?= $(git_origin_push_url)
 else
-RABBITMQ_CURRENT_REPO ?= $(RABBITMQ_UPSTREAM_REPO)
+RABBITMQ_CURRENT_FETCH_URL ?= $(RABBITMQ_UPSTREAM_FETCH_URL)
+RABBITMQ_CURRENT_PUSH_URL ?= $(RABBITMQ_UPSTREAM_PUSH_URL)
 endif
 
 # Macro to replace the following pattern:
@@ -168,17 +178,20 @@ dep_rmq_commits = $(if $(dep_$(1)),					\
 		  $(pkg_$(1)_commit))
 
 define dep_fetch_git_rmq
-	url1='$(call dep_rmq_repo,$(RABBITMQ_CURRENT_REPO),$(1))'; \
-	url2='$(call dep_rmq_repo,$(RABBITMQ_UPSTREAM_REPO),$(1))'; \
-	(test "$$$$url1" != '$(RABBITMQ_CURRENT_REPO)' && \
-	 git clone -q -n -- "$$$$url1" $(DEPS_DIR)/$(call dep_name,$(1))) || \
-	git clone -q -n -- "$$$$url2" $(DEPS_DIR)/$(call dep_name,$(1)); \
+	fetch_url1='$(call dep_rmq_repo,$(RABBITMQ_CURRENT_FETCH_URL),$(1))'; \
+	fetch_url2='$(call dep_rmq_repo,$(RABBITMQ_UPSTREAM_FETCH_URL),$(1))'; \
+	(test "$$$$fetch_url1" != '$(RABBITMQ_CURRENT_FETCH_URL)' && \
+	 git clone -q -n -- "$$$$fetch_url1" $(DEPS_DIR)/$(call dep_name,$(1)) && \
+	 push_url='$(call dep_rmq_repo,$(RABBITMQ_CURRENT_PUSH_URL),$(1))') || \
+	(git clone -q -n -- "$$$$fetch_url2" $(DEPS_DIR)/$(call dep_name,$(1)) && \
+	 push_url='$(call dep_rmq_repo,$(RABBITMQ_UPSTREAM_PUSH_URL),$(1))'); \
 	cd $(DEPS_DIR)/$(call dep_name,$(1)) && ( \
 	$(foreach ref,$(call dep_rmq_commits,$(1)), \
 	  git checkout -q $(ref) >/dev/null 2>&1 || \
 	  ) \
 	(echo "error: no valid pathspec among: $(call dep_rmq_commits,$(1))" \
-	  1>&2 && false) )
+	  1>&2 && false) ) && \
+	git remote set-url --push origin "$$$$push_url"
 endef
 
 # --------------------------------------------------------------------