diff --git a/include/ZeroTierOne.h b/include/ZeroTierOne.h
index 27b08ff5c..752554dcc 100644
--- a/include/ZeroTierOne.h
+++ b/include/ZeroTierOne.h
@@ -1251,6 +1251,11 @@ typedef struct
 	 * sso provider
 	 **/
 	char ssoProvider[64];
+
+	uint32_t tags[ZT_MAX_NETWORK_TAGS][2];
+	unsigned int tagsCount;
+
+
 } ZT_VirtualNetworkConfig;
 
 /**
diff --git a/node/Network.cpp b/node/Network.cpp
index 233c10641..1c5e9329a 100644
--- a/node/Network.cpp
+++ b/node/Network.cpp
@@ -1492,6 +1492,16 @@ void Network::_externalConfig(ZT_VirtualNetworkConfig *ec) const
 	ec->portError = _portError;
 	ec->netconfRevision = (_config) ? (unsigned long)_config.revision : 0;
 
+	for (unsigned int i = 0; i<ZT_MAX_NETWORK_TAGS; i++) {
+		if (_config.tags[i].id()) {
+			ec->tags[i][0] = _config.tags[i].id();
+			ec->tags[i][1] = _config.tags[i].value();
+		} else {
+			ec->tagsCount = i;
+			break;
+		}
+	}
+
 	ec->assignedAddressCount = 0;
 	for(unsigned int i=0;i<ZT_MAX_ZT_ASSIGNED_ADDRESSES;++i) {
 		if (i < _config.staticIpCount) {
diff --git a/service/OneService.cpp b/service/OneService.cpp
index 8a0aee294..60533fec9 100644
--- a/service/OneService.cpp
+++ b/service/OneService.cpp
@@ -542,6 +542,19 @@ static void _networkToJson(nlohmann::json &nj,NetworkState &ns)
 	nj["allowDefault"] = localSettings.allowDefault;
 	nj["allowDNS"] = localSettings.allowDNS;
 
+	nlohmann::json tags = nlohmann::json::array();
+	for(unsigned int i=0;i<ns.config().tagsCount;++i) {
+		if (ns.config().tags[i]) {
+			nlohmann::json tag = nlohmann::json::array();
+			tag = ns.config().tags[i];
+			tags[i] = tag;
+		} else {
+			break;
+		}
+	}
+	nj["tags"] = tags;
+
+
 	nlohmann::json aa = nlohmann::json::array();
 	for(unsigned int i=0;i<ns.config().assignedAddressCount;++i) {
 		aa.push_back(reinterpret_cast<const InetAddress *>(&(ns.config().assignedAddresses[i]))->toString(tmp));