diff --git a/lib/yang.c b/lib/yang.c
index dc2a3e9f9b..081d856303 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -79,6 +79,7 @@ static const char *const frr_native_modules[] = {
 	"frr-ripngd",
 	"frr-isisd",
 	"frr-vrrpd",
+	"frr-zebra",
 };
 
 /* Generate the yang_modules tree. */
diff --git a/yang/subdir.am b/yang/subdir.am
index 3778316128..b614bcd11e 100644
--- a/yang/subdir.am
+++ b/yang/subdir.am
@@ -27,7 +27,6 @@ dist_yangmodels_DATA += yang/frr-interface.yang
 dist_yangmodels_DATA += yang/frr-route-map.yang
 dist_yangmodels_DATA += yang/frr-vrf.yang
 dist_yangmodels_DATA += yang/frr-route-types.yang
-dist_yangmodels_DATA += yang/frr-zebra.yang
 dist_yangmodels_DATA += yang/frr-routing.yang
 dist_yangmodels_DATA += yang/ietf/ietf-routing-types.yang
 
@@ -58,3 +57,7 @@ endif
 if STATICD
 dist_yangmodels_DATA += yang/frr-staticd.yang
 endif
+
+if ZEBRA
+dist_yangmodels_DATA += yang/frr-zebra.yang
+endif