diff --git a/Makefile.am b/Makefile.am
index b917838b5..cf1dd77f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,6 +78,7 @@ all-local: bootstrap
 #	echo $(CXXFLAGS) $(DEBUG_FLAGS) > buildFlags
 	$(MAKE) -C utils
 	$(MAKE) -C oam/oamcpp
+	$(MAKE) -C net-snmp
 	$(MAKE) -C snmpd
 	$(MAKE) -C dbcon/execplan
 	$(MAKE) -C dbcon/joblist
@@ -110,6 +111,7 @@ all-local: bootstrap
 install:
 	$(MAKE) -C utils install
 	$(MAKE) -C oam/oamcpp install
+	$(MAKE) -C net-snmp install
 	$(MAKE) -C snmpd install
 	$(MAKE) -C dbcon/execplan install
 	$(MAKE) -C dbcon/joblist install
diff --git a/build/bootstrap b/build/bootstrap
index 3b66aa48e..cd7558af5 100755
--- a/build/bootstrap
+++ b/build/bootstrap
@@ -121,9 +121,21 @@ then
 	./configure --prefix=$PREFIX
 else
 	echo "BUILDING WITH DEFAULT PREFIX"
-	./configure --prefix=/usr/local/mariadb/columnstore
+	PREFIX=/usr/local/mariadb/columnstore
+	./configure --prefix=$PREFIX
 fi
 
+cd net-snmp/net-snmp
+	./configure --prefix=$PREFIX --with-mib-modules=disman/event-mib --with-cc=gcc \
+                --with-logfile=$PREFIX/log/snmpd.log \
+                --with-sys-location=Unknown \
+                --with-sys-contact=root@localhost.localdomain \
+                --with-default-snmp-version=3 \
+                --with-persistent-directory=$PREFIX/var/net-snmp \
+                --without-openssl \
+                --with-ldflags="-Wl,-rpath -Wl,$PREFIX/lib"
+
+
 #for x in \
 #$(find . -name '[mM]akefile' \
 #    | xargs grep -l ^bootstrap: \
diff --git a/net-snmp/Makefile.am b/net-snmp/Makefile.am
index 28d26ac7d..15cd972dc 100644
--- a/net-snmp/Makefile.am
+++ b/net-snmp/Makefile.am
@@ -1,6 +1,6 @@
 # $Id$
 
-.PHONY: test coverage leakcheck docs bootstrap
+.PHONY: test coverage leakcheck docs bootstrap install
 test:
 
 coverage:
@@ -9,7 +9,9 @@ leakcheck:
 
 docs:
 
-bootstrap:
-	cd net-snmp-5.2.1.2; \
-	./CalpontConfigure.sh --prefix=$(prefix)
+all:
+	$(MAKE) -C net-snmp
+
+install:
+	$(MAKE) -C net-snmp install
 
diff --git a/net-snmp/net-snmp b/net-snmp/net-snmp
new file mode 120000
index 000000000..14c8d1408
--- /dev/null
+++ b/net-snmp/net-snmp
@@ -0,0 +1 @@
+net-snmp-5.7.3/
\ No newline at end of file
diff --git a/oamapps/Makefile.am b/oamapps/Makefile.am
index fa0e7ab13..d7670f180 100644
--- a/oamapps/Makefile.am
+++ b/oamapps/Makefile.am
@@ -16,6 +16,8 @@
 # MA 02110-1301, USA.
 
 # $Id: Makefile.am 878 2009-04-03 20:34:32Z rdempsey $
+#
+.PHONY install
 
 SUBDIRS = mcsadmin columnstoreDB postConfigure serverMonitor traphandler \
 sendtrap columnstoreSupport
@@ -28,8 +30,9 @@ leakcheck:
 
 docs:
 
-bootstrap:
+install:
 	for subdir in $(SUBDIRS); \
-		do $(MAKE) -C $$subdir bootstrap || exit $$?; \
+		do $(MAKE) -C $$subdir install
 	done
 
+