diff --git a/net/nagios-plugins/Makefile b/admin/nagios-plugins/Makefile
similarity index 95%
rename from net/nagios-plugins/Makefile
rename to admin/nagios-plugins/Makefile
index 68490810e..197624fdb 100644
--- a/net/nagios-plugins/Makefile
+++ b/admin/nagios-plugins/Makefile
@@ -23,9 +23,8 @@ include $(INCLUDE_DIR)/package.mk
 comma:= ,
 
 define Package/nagios-plugins
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Monitoring
+  SECTION:=admin
+  CATEGORY:=Administration
   DEPENDS:=+uclibcxx +libpq
   TITLE:=plugins for Nagios checks
   URL:=http://nagiosplug.sourceforge.net/
diff --git a/net/nagios-plugins/patches/002-plugins.patch b/admin/nagios-plugins/patches/002-plugins.patch
similarity index 100%
rename from net/nagios-plugins/patches/002-plugins.patch
rename to admin/nagios-plugins/patches/002-plugins.patch
diff --git a/net/nagios-plugins/patches/003-pgsl-header-fix.patch b/admin/nagios-plugins/patches/003-pgsl-header-fix.patch
similarity index 100%
rename from net/nagios-plugins/patches/003-pgsl-header-fix.patch
rename to admin/nagios-plugins/patches/003-pgsl-header-fix.patch
diff --git a/net/nagios/Makefile b/admin/nagios/Makefile
similarity index 96%
rename from net/nagios/Makefile
rename to admin/nagios/Makefile
index 734caf6f1..fc9cb8715 100644
--- a/net/nagios/Makefile
+++ b/admin/nagios/Makefile
@@ -18,9 +18,8 @@ PKG_MD5SUM:=8c3a29e138f2ff8c8abbd3dd8a40c4b6
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nagios
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Monitoring
+  SECTION:=admin
+  CATEGORY:=Administration
   DEPENDS:=+libpthread +microperl +libltdl
   TITLE:=service and network monitoring program
   URL:=http://www.nagios.org/
diff --git a/net/nrpe/Makefile b/admin/nrpe/Makefile
similarity index 97%
rename from net/nrpe/Makefile
rename to admin/nrpe/Makefile
index 06ca352f6..184cc4242 100644
--- a/net/nrpe/Makefile
+++ b/admin/nrpe/Makefile
@@ -19,9 +19,8 @@ PKG_MD5SUM:=b2d75e2962f1e3151ef58794d60c9e97
 include $(INCLUDE_DIR)/package.mk
 
 define Package/nrpe
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Monitoring
+  SECTION:=admin
+  CATEGORY:=Administration
   DEPENDS:=+libopenssl
   TITLE:=Daemon to execute Nagios check commands on remote hosts
   URL:=http://www.nagios.org/download
diff --git a/net/nrpe/files/nrpe.cfg b/admin/nrpe/files/nrpe.cfg
similarity index 100%
rename from net/nrpe/files/nrpe.cfg
rename to admin/nrpe/files/nrpe.cfg
diff --git a/net/nrpe/files/nrpe.init b/admin/nrpe/files/nrpe.init
similarity index 100%
rename from net/nrpe/files/nrpe.init
rename to admin/nrpe/files/nrpe.init
diff --git a/net/nrpe/patches/100-openssl-dh.patch b/admin/nrpe/patches/100-openssl-dh.patch
similarity index 100%
rename from net/nrpe/patches/100-openssl-dh.patch
rename to admin/nrpe/patches/100-openssl-dh.patch
diff --git a/net/nsca/Makefile b/admin/nsca/Makefile
similarity index 95%
rename from net/nsca/Makefile
rename to admin/nsca/Makefile
index cf596cb2a..56789c76d 100644
--- a/net/nsca/Makefile
+++ b/admin/nsca/Makefile
@@ -18,9 +18,8 @@ PKG_MD5SUM:=33a98e7975f633a9489d7a8938ed6131
 include $(INCLUDE_DIR)/package.mk
 
 define Package/send-nsca
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Monitoring
+  SECTION:=admin
+  CATEGORY:=Administration
   DEPENDS:=+libmcrypt
   TITLE:=Nagios Service Check Acceptor (NSCA) client
   URL:=http://www.nagios.org/