diff --git a/Makefile b/Makefile
index 1830c3d..64a0b87 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 DOCKER_REVISION ?= snmp_exporter-$(USER)
 DOCKER_TAG = docker-push.ocf.berkeley.edu/snmp_exporter:$(DOCKER_REVISION)
 
-SNMP_EX_VERSION := v0.16.1
+SNMP_EX_VERSION := master
 
 .PHONY: dev
 dev: cook-image
@@ -19,7 +19,6 @@ gen-config: generator.yml vendor-snmp-exporter
 vendor-snmp-exporter:
 	git clone -q https://github.com/prometheus/snmp_exporter vendor-snmp-exporter
 	cd vendor-snmp-exporter/generator && \
-		git checkout $(SNMP_EX_VERSION) && \
 		make mibs
 
 .PHONY: clean
diff --git a/generator.yml b/generator.yml
index 02f1f18..b711253 100644
--- a/generator.yml
+++ b/generator.yml
@@ -24,3 +24,23 @@ modules:
     auth:
       username: public
       security_level: noAuthNoPriv
+
+  apcpdu:
+    version: 1
+    walk:
+      - sysUpTime
+      - interfaces
+      - 1.3.6.1.4.1.318.1.1.12
+    lookups:
+      - source_indexes: [rPDULoadStatusIndex]
+        lookup: rPDUOutletStatusOutletName
+        drop_source_indexes: false
+    overrides:
+      ifType:
+        type: EnumAsInfo
+      rPDULoadStatusLoad:
+        type: gauge
+      rPDULoadStatusLoadState:
+        type: EnumAsStateSet
+    auth:
+      community: public