diff --git a/.gitmodules b/.gitmodules
index a6a4a1a9f6..8b5f020f35 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,7 @@
 [submodule "src/p4-hlir/p4-hlir"]
 	path = src/p4-hlir/p4-hlir
 	url = https://github.com/p4lang/p4-hlir
+[submodule "quagga"]
+	path = src/sonic-quagga
+	url = https://github.com/Azure/sonic-quagga
+	branch = debian/0.99.24.1
diff --git a/src/Makefile b/src/Makefile
index 9dd79d5b9b..9b7cc582a5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -25,9 +25,6 @@ libnl-%.deb:
 libteam5_1.26-1_amd64.deb libteam-dev_1.26-1_amd64.deb libteam-utils_1.26-1_amd64.deb libteamdctl0_1.26-1_amd64.deb: libnl-%.deb
 	pushd libteam; ./build.sh; popd
 
-quagga_0.99.24.1-2_amd64.deb:
-	pushd quagga; ./build.sh; popd
-	
 redis-server_3.0.7-2_amd64.deb redis-tools_3.0.7-2_amd64.deb redis-sentinel_3.0.7-2_amd64.deb:
 	pushd redis; ./build.sh; popd
 	
@@ -55,6 +52,9 @@ p4-switch_1.0.0_amd64.deb: thrift-compiler_0.9.3-2_amd64.deb python-thrift_0.9.3
 	$(foreach dep, $^, $(call install_deb, $(dep)))
 	pushd p4-switch; ./build.sh; popd
 	
+quagga_0.99.24.1-2.1_amd64.deb:
+	$(call build_project, sonic-quagga)
+	
 libswsscommon_1.0.0_amd64.deb libswsscommon-dev_1.0.0_amd64.deb: redis-server_3.0.7-2_amd64.deb redis-tools_3.0.7-2_amd64.deb libhiredis0.13_0.13.3-2_amd64.deb libhiredis-dev_0.13.3-2_amd64.deb
 	$(foreach dep, $^, $(call install_deb, $(dep)))
 	$(call build_project, sonic-swss-common)
diff --git a/src/quagga/build.sh b/src/quagga/build.sh
deleted file mode 100755
index 03ea3bf5cd..0000000000
--- a/src/quagga/build.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash -x
-
-mkdir quagga
-
-# Get debian source for 0.9.24.1-2
-wget -O quagga_0.99.24.1.orig.tar.gz 'https://sonicstorage.blob.core.windows.net/packages/quagga_0.99.24.1.orig.tar.gz?sv=2015-04-05&sr=b&sig=7g3AC%2FkoX3wYztJYtXFt6Wl7zj%2BYwLkbXVNaSaRvUDU%3D&se=2026-07-21T00%3A07%3A31Z&sp=r'
-tar -xzf quagga_0.99.24.1.orig.tar.gz --strip-components=1 -C quagga
-ls -lrt
-
-# Get debian packaging for 0.99.24.1-2
-wget -O quagga_0.99.24.1-2.debian.tar.xz 'https://sonicstorage.blob.core.windows.net/packages/quagga_0.99.24.1-2.debian.tar.xz?sv=2015-04-05&sr=b&sig=VFEq4ec99OjVaypAx14DkO5I8N4CIBIPOuSw79qHUXg%3D&se=2026-07-21T00%3A03%3A10Z&sp=r'
-tar -xJf quagga_0.99.24.1-2.debian.tar.xz -C quagga
-ls -lrt
-
-cd quagga
-ls -lrt
-
-# Enable FPM in debian/rules
-awk '/--with-libpam/ { print; print "                --enable-fpm \\"; next }1' debian/rules > tmp && mv tmp debian/rules
-
-# Update changelog
-#echo 'quagga (0.99.24.1-2.1) unstable; urgency=medium
-#
-#   * Non-maintainer upload.
-#   * enable fpm
-#
-#  -- Guohan Lu <gulv@microsoft.com>  Sat, 18 Jul 2015 16:10:47 -0700
-#' > tmp && cat debian/changelog >> tmp && mv tmp debian/changelog
-
-#./configure --enable-fpm
-#make
-
-sudo chmod a+x debian/rules
-dpkg-buildpackage -rfakeroot -b -us -uc
-cd ..
-cp *.deb ..
diff --git a/src/sonic-quagga b/src/sonic-quagga
new file mode 160000
index 0000000000..1997fb28ef
--- /dev/null
+++ b/src/sonic-quagga
@@ -0,0 +1 @@
+Subproject commit 1997fb28efe441a761b16559775006a2e37913e0