diff --git a/dockers/docker-snmp-sv2/snmpd.conf.j2 b/dockers/docker-snmp-sv2/snmpd.conf.j2
index 76a462026e18..78cf34d9f7fe 100644
--- a/dockers/docker-snmp-sv2/snmpd.conf.j2
+++ b/dockers/docker-snmp-sv2/snmpd.conf.j2
@@ -27,10 +27,9 @@ agentAddress {{ snmp_agent_address_3 }}
 {% endif %}
 {% else %}
 agentAddress udp:161
+agentAddress udp6:161
 {% endif %}
 
-# TODO: only support ipv4 lo addresses, add ipv6 support later
-
 ###############################################################################
 #
 #  ACCESS CONTROL
@@ -47,6 +46,7 @@ rocommunity {{ community }}
 {% endfor %}
 {% else %}
 rocommunity {{ snmp_rocommunity }}
+rocommunity6 {{ snmp_rocommunity }}
 {% endif %}
 
 ###############################################################################
diff --git a/src/snmpd/patch-5.7.3+dfsg/0008-Enable-macro-DEB_BUILD_ARCH_OS-in-order-to-build-ipv.patch b/src/snmpd/patch-5.7.3+dfsg/0008-Enable-macro-DEB_BUILD_ARCH_OS-in-order-to-build-ipv.patch
new file mode 100644
index 000000000000..f3e878077ff5
--- /dev/null
+++ b/src/snmpd/patch-5.7.3+dfsg/0008-Enable-macro-DEB_BUILD_ARCH_OS-in-order-to-build-ipv.patch
@@ -0,0 +1,24 @@
+From 6e038423d7a3269dbfd85b3d7ada6015479f1559 Mon Sep 17 00:00:00 2001
+From: Qi Luo <qiluo-msft@users.noreply.github.com>
+Date: Fri, 20 Sep 2019 00:42:19 +0000
+Subject: [PATCH] Enable macro DEB_BUILD_ARCH_OS in order to build ipv6 feature
+
+---
+ debian/rules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/debian/rules b/debian/rules
+index 4c3b5b6..1fab6a4 100755
+--- a/debian/rules
++++ b/debian/rules
+@@ -5,6 +5,7 @@
+ # without -pie build fails during perl module build somehow...
+ export DEB_BUILD_MAINT_OPTIONS := hardening=+all,-pie
+ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
++DEB_BUILD_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
+ 
+ LIB_VERSION = 30
+ UPSTREAM_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ':' | sed 's/ //' | sed 's/~dfsg.*$$//')
+-- 
+2.18.0
+
diff --git a/src/snmpd/patch-5.7.3+dfsg/series b/src/snmpd/patch-5.7.3+dfsg/series
index a8741fb5bb9d..5cd0b06510f6 100644
--- a/src/snmpd/patch-5.7.3+dfsg/series
+++ b/src/snmpd/patch-5.7.3+dfsg/series
@@ -5,3 +5,4 @@
 0005-Port-OpenSSL-1.1.0-with-support-for-1.0.2.patch
 0006-From-Jiri-Cervenka-snmpd-Fixed-agentx-crashing-and-or-freezing-on-timeout.patch
 0007-Linux-VRF-5.7.3-Support.patch
+0008-Enable-macro-DEB_BUILD_ARCH_OS-in-order-to-build-ipv.patch