diff --git a/common/Makedefs b/common/Makedefs
index d5bbfcb..0911ee8 100644
--- a/common/Makedefs
+++ b/common/Makedefs
@@ -36,3 +36,6 @@
 
 MONITORING_BRANCH ?= $(DEFAULT_BRANCH)
 MONITORING_GIT_URL ?= $(CORD_BASE_GIT_URL)/monitoring.git
+
+HYPERCACHE_BRANCH ?= $(DEFAULT_BRANCH)
+HYPERCACHE_GIT_URL ?= $(CORD_BASE_GIT_URL)/hypercache.git
diff --git a/common/Makefile.services b/common/Makefile.services
index 262784b..d34313c 100644
--- a/common/Makefile.services
+++ b/common/Makefile.services
@@ -5,12 +5,13 @@
 services: $(SERVICE_DIR) \
           $(SERVICE_DIR)/exampleservice \
           $(SERVICE_DIR)/olt \
-	        $(SERVICE_DIR)/vsg \
+          $(SERVICE_DIR)/vsg \
           $(SERVICE_DIR)/vtn \
-	        $(SERVICE_DIR)/vrouter \
-	        $(SERVICE_DIR)/vtr \
-	        $(SERVICE_DIR)/onos-service \
-	        $(SERVICE_DIR)/fabric
+          $(SERVICE_DIR)/vrouter \
+          $(SERVICE_DIR)/vtr \
+          $(SERVICE_DIR)/onos-service \
+          $(SERVICE_DIR)/fabric \
+          $(SERVICE_DIR)/hypercache
 
 monitoring_services: $(SERVICE_DIR)/monitoring
 
@@ -52,6 +53,9 @@
 $(SERVICE_DIR)/monitoring:
 	git -C $(SERVICE_DIR) $(GITOPTS) clone -b $(MONITORING_BRANCH) $(MONITORING_GIT_URL)
 
+$(SERVICE_DIR)/hypercache:
+	git -C $(SERVICE_DIR) $(GITOPTS) clone -b $(HYPERCACHE_BRANCH) $(HYPERCACHE_GIT_URL)
+
 cleanup:
 	rm -rf $(SERVICE_DIR)/*
 
@@ -64,4 +68,5 @@
 	git -C $(SERVICE_DIR)/vtr pull
 	git -C $(SERVICE_DIR)/onos-service pull
 	git -C $(SERVICE_DIR)/fabric pull
+	git -C $(SERVICE_DIR)/hypercache pull