diff --git a/.gitmodules b/.gitmodules
index 08546d4607..45715c994c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -69,3 +69,6 @@
 [submodule "Switch-SDK-drivers"]
 	path = platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
 	url = https://github.com/Mellanox/Switch-SDK-drivers
+[submodule "src/telemetry/sonic-telemetry"]
+	path = src/telemetry/sonic-telemetry
+	url = https://github.com/Azure/sonic-telemetry.git
diff --git a/src/telemetry/Makefile b/src/telemetry/Makefile
index 91a822d4f9..faf334db0e 100644
--- a/src/telemetry/Makefile
+++ b/src/telemetry/Makefile
@@ -2,9 +2,11 @@ export GOPATH=/tmp/go
 
 INSTALL := /usr/bin/install
 
-all: sonic-telemetry
+all: telemetry
 
-sonic-telemetry:
+telemetry:
+	mkdir -p ${GOPATH}/src/github.com/Azure/
+	cp -a sonic-telemetry ${GOPATH}/src/github.com/Azure/
 	/usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/telemetry
 	/usr/local/go/bin/go get -v github.com/Azure/sonic-telemetry/dialout/dialout_client_cli
 
diff --git a/src/telemetry/sonic-telemetry b/src/telemetry/sonic-telemetry
new file mode 160000
index 0000000000..d8e5adf8cb
--- /dev/null
+++ b/src/telemetry/sonic-telemetry
@@ -0,0 +1 @@
+Subproject commit d8e5adf8cb9f810624f61daf6d343dfe8b3fa4b0