diff --git a/Makefile b/Makefile
index 6f8f2e8f8..3a540fe63 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PAGER?=		less
 all:
 	@cat ${.CURDIR}/README.md | ${PAGER}
 
-CATEGORIES=	devel net sysutils security www
+CATEGORIES=	devel net net-mgmt sysutils security www
 
 .for CATEGORY in ${CATEGORIES}
 _${CATEGORY}!=	ls -1d ${CATEGORY}/*
diff --git a/net/snmp/Makefile b/net-mgmt/snmp/Makefile
similarity index 100%
rename from net/snmp/Makefile
rename to net-mgmt/snmp/Makefile
diff --git a/net/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc b/net-mgmt/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc
similarity index 100%
rename from net/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc
rename to net-mgmt/snmp/src/etc/inc/plugins.inc.d/bsnmpd.inc
diff --git a/net/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml b/net-mgmt/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
similarity index 100%
rename from net/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
rename to net-mgmt/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/ACL/ACL.xml
diff --git a/net/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml b/net-mgmt/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml
similarity index 100%
rename from net/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml
rename to net-mgmt/snmp/src/opnsense/mvc/app/models/OPNsense/SNMP/Menu/Menu.xml
diff --git a/net/snmp/src/www/services_snmp.php b/net-mgmt/snmp/src/www/services_snmp.php
similarity index 100%
rename from net/snmp/src/www/services_snmp.php
rename to net-mgmt/snmp/src/www/services_snmp.php
diff --git a/net/igmpproxy/Makefile b/net/igmp-proxy/Makefile
similarity index 87%
rename from net/igmpproxy/Makefile
rename to net/igmp-proxy/Makefile
index fef19a7f2..1d764093b 100644
--- a/net/igmpproxy/Makefile
+++ b/net/igmp-proxy/Makefile
@@ -1,4 +1,4 @@
-PLUGIN_NAME=		igmpproxy
+PLUGIN_NAME=		igmp-proxy
 PLUGIN_VERSION=		0.1
 PLUGIN_PRIVATE=		yes
 PLUGIN_DEPENDS=		igmpproxy
diff --git a/net/igmpproxy/src/etc/inc/plugins.inc.d/igmpproxy.inc b/net/igmp-proxy/src/etc/inc/plugins.inc.d/igmpproxy.inc
similarity index 100%
rename from net/igmpproxy/src/etc/inc/plugins.inc.d/igmpproxy.inc
rename to net/igmp-proxy/src/etc/inc/plugins.inc.d/igmpproxy.inc
diff --git a/net/igmpproxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml b/net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml
similarity index 100%
rename from net/igmpproxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml
rename to net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/ACL/ACL.xml
diff --git a/net/igmpproxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml b/net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml
similarity index 100%
rename from net/igmpproxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml
rename to net/igmp-proxy/src/opnsense/mvc/app/models/OPNsense/IGMPProxy/Menu/Menu.xml
diff --git a/net/igmpproxy/src/www/services_igmpproxy.php b/net/igmp-proxy/src/www/services_igmpproxy.php
similarity index 100%
rename from net/igmpproxy/src/www/services_igmpproxy.php
rename to net/igmp-proxy/src/www/services_igmpproxy.php
diff --git a/net/igmpproxy/src/www/services_igmpproxy_edit.php b/net/igmp-proxy/src/www/services_igmpproxy_edit.php
similarity index 100%
rename from net/igmpproxy/src/www/services_igmpproxy_edit.php
rename to net/igmp-proxy/src/www/services_igmpproxy_edit.php