diff --git a/.gitmodules b/.gitmodules
index 4bddfb4a60da..c837451c9480 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -66,3 +66,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-cel"]
 	path = platform/broadcom/sonic-platform-modules-cel
 	url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git
+[submodule "src/sonic-frr/frr"]
+	path = src/sonic-frr/frr
+	url = https://github.com/FRRouting/frr.git
diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
index 80d5a9ad0900..b044781a60f2 100644
--- a/src/sonic-frr/Makefile
+++ b/src/sonic-frr/Makefile
@@ -5,11 +5,6 @@ SHELL = /bin/bash
 MAIN_TARGET = frr_$(FRR_VERSION)_amd64.deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
-        # Cloning FRR repo if not already done
-	if [ ! -d "frr" ]; then \
-		git clone -b stable/$(FRR_VERSION) https://github.com/FRRouting/frr.git; \
-	fi
-
         # Replacing frr's rules/install files with SONiC's own versions to activate
         # specific knobs and adjust install process to address SONiC's needs.
 	cp sonic_frr.rules frr/debian/rules
diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr
new file mode 160000
index 000000000000..5424c62d6e9d
--- /dev/null
+++ b/src/sonic-frr/frr
@@ -0,0 +1 @@
+Subproject commit 5424c62d6e9d574a00529edfc0a0b3bb3beb8811