diff --git a/configure.ac b/configure.ac
index db91f78a16..cce8ab0af4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1705,6 +1705,22 @@ else
 	AC_MSG_WARN([python support disabled, building mod_python will fail!])
 fi
 
+#
+# SNMP checks for mod_snmp
+#
+AC_PATH_PROG([NET_SNMP_CONFIG], [net-snmp-config], [no])
+if test "$NET_SNMP_CONFIG" != "no"; then
+	AC_MSG_CHECKING([for Net-SNMP libraries via net-snmp-config])
+	SNMP_LIBS="`$NET_SNMP_CONFIG --base-agent-libs`"
+else
+	# net-snmp-config not in path, fallback to sensible defaults
+	SNMP_LIBS="-lnetsnmpmibs -lnetsnmpagent -lnetsnmp"
+fi
+
+# fix linking error on Solaris patched Net-SNMP
+AS_CASE([$host], [*-solaris2*], [AC_CHECK_LIB([dladm], [dladm_open], [SNMP_LIBS="$SNMP_LIBS -ldladm"])])
+AC_SUBST(SNMP_LIBS)
+
 CHECK_ERLANG
 
 # we never use this, and hard setting it will make cross compile work better
diff --git a/src/mod/event_handlers/mod_snmp/Makefile.am b/src/mod/event_handlers/mod_snmp/Makefile.am
index e949e9ad9e..a94ebe0c51 100644
--- a/src/mod/event_handlers/mod_snmp/Makefile.am
+++ b/src/mod/event_handlers/mod_snmp/Makefile.am
@@ -4,5 +4,5 @@ MODNAME=mod_snmp
 mod_LTLIBRARIES = mod_snmp.la
 mod_snmp_la_SOURCES  = mod_snmp.c subagent.c
 mod_snmp_la_CFLAGS   = $(AM_CFLAGS)
-mod_snmp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la -lnetsnmpmibs -lnetsnmpagent -lnetsnmp
+mod_snmp_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(SNMP_LIBS)
 mod_snmp_la_LDFLAGS  = -avoid-version -module -no-undefined -shared