diff --git a/lib/yang.c b/lib/yang.c
index 2b360376d3ba..adf2ba2ab024 100644
--- a/lib/yang.c
+++ b/lib/yang.c
@@ -40,7 +40,8 @@ static LY_ERR yang_module_imp_clb(const char *mod_name, const char *mod_rev,
 	struct yang_module_embed *e;
 
 	if (!strcmp(mod_name, "ietf-inet-types") ||
-	    !strcmp(mod_name, "ietf-yang-types"))
+	    !strcmp(mod_name, "ietf-yang-types") ||
+	    !strcmp(mod_name, "ietf-yang-metadata"))
 		/* libyang has these built in, don't try finding them here */
 		return LY_ENOTFOUND;
 
diff --git a/mgmtd/subdir.am b/mgmtd/subdir.am
index 0af64dc0be52..3eaa9567ab8e 100644
--- a/mgmtd/subdir.am
+++ b/mgmtd/subdir.am
@@ -61,6 +61,7 @@ mgmtd_mgmtd_SOURCES = \
 	# end
 nodist_mgmtd_mgmtd_SOURCES = \
 	yang/frr-zebra.yang.c \
+	yang/frr-zebra-route-map.yang.c \
 	yang/ietf/ietf-netconf-acm.yang.c \
 	yang/ietf/ietf-netconf.yang.c \
 	yang/ietf/ietf-netconf-with-defaults.yang.c \