diff --git a/rules/docker-fpm-frr.mk b/rules/docker-fpm-frr.mk
index f9a858611fa1..81036cc19612 100644
--- a/rules/docker-fpm-frr.mk
+++ b/rules/docker-fpm-frr.mk
@@ -2,7 +2,7 @@
 
 DOCKER_FPM_FRR = docker-fpm-frr.gz
 $(DOCKER_FPM_FRR)_PATH = $(DOCKERS_PATH)/docker-fpm-frr
-$(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(SWSS)
+$(DOCKER_FPM_FRR)_DEPENDS += $(FRR) $(FRR_PYTHONTOOLS) $(SWSS)
 $(DOCKER_FPM_FRR)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
 SONIC_DOCKER_IMAGES += $(DOCKER_FPM_FRR)
 
diff --git a/rules/frr.mk b/rules/frr.mk
index a5736452b1ab..d09294184e9f 100644
--- a/rules/frr.mk
+++ b/rules/frr.mk
@@ -7,3 +7,9 @@ FRR = frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
 $(FRR)_DEPENDS += $(LIBSNMP_DEV)
 $(FRR)_SRC_PATH = $(SRC_PATH)/sonic-frr
 SONIC_MAKE_DEBS += $(FRR)
+
+# FRRouting Pythontools
+FRR_PYTHONTOOLS = frr-pythontools_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
+$(FRR_PYTHONTOOLS)_DEPENDS += $(LIBSNMP_DEV)
+$(FRR_PYTHONTOOLS)_SRC_PATH = $(SRC_PATH)/sonic-frr
+SONIC_MAKE_DEBS += $(FRR_PYTHONTOOLS)
diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
index 22cd1897a1f5..53ac03d630ad 100644
--- a/src/sonic-frr/Makefile
+++ b/src/sonic-frr/Makefile
@@ -3,6 +3,7 @@ SHELL = /bin/bash
 .SHELLFLAGS += -e
 
 MAIN_TARGET = frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
+DERIVED_TARGET = frr-pythontools_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
 
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 
@@ -16,7 +17,9 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib
 	cd ..
 	mv frr_$(FRR_VERSION)-*_amd64.deb frr_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
-	mv $* $(DEST)/
+	mv frr-pythontools_$(FRR_VERSION)-*_all.deb frr-pythontools_$(FRR_VERSION)-1~sonic.debian8+1_amd64.deb
+	mv $(DERIVED_TARGET) $* $(DEST)/
 
 	popd
 
+$(addprefix $(DEST)/, $(DERIVED_TARGET)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)