diff --git a/net/monitoring-plugins/Makefile b/net/monitoring-plugins/Makefile
index a64232346c3..e0511229f98 100644
--- a/net/monitoring-plugins/Makefile
+++ b/net/monitoring-plugins/Makefile
@@ -9,7 +9,7 @@ COMMENT-snmp=	monitoring plugins using snmp
 COMMENT-radius=	RADIUS monitoring plugin
 
 V=		3.0.0rc2pl1
-REVISION-main=	0
+REVISION=	1
 #SITES=		https://www.monitoring-plugins.org/download/
 GH_ACCOUNT=	monitoring-plugins
 GH_PROJECT=	monitoring-plugins
diff --git a/net/monitoring-plugins/pkg/PLIST-dbi b/net/monitoring-plugins/pkg/PLIST-dbi
index 257dbcbfa7c..5b9698d01fb 100644
--- a/net/monitoring-plugins/pkg/PLIST-dbi
+++ b/net/monitoring-plugins/pkg/PLIST-dbi
@@ -1,3 +1 @@
-@conflict nagios-plugins-dbi-*
-@pkgpath net/nagios/plugins,-dbi
 @bin libexec/nagios/check_dbi
diff --git a/net/monitoring-plugins/pkg/PLIST-fping b/net/monitoring-plugins/pkg/PLIST-fping
index e5b60979cbf..6b4d9772e96 100644
--- a/net/monitoring-plugins/pkg/PLIST-fping
+++ b/net/monitoring-plugins/pkg/PLIST-fping
@@ -1,3 +1 @@
-@conflict nagios-plugins-fping-*
-@pkgpath net/nagios/plugins,-fping
 @bin libexec/nagios/check_fping
diff --git a/net/monitoring-plugins/pkg/PLIST-game b/net/monitoring-plugins/pkg/PLIST-game
index 66f90c67b1d..14fa2cd0635 100644
--- a/net/monitoring-plugins/pkg/PLIST-game
+++ b/net/monitoring-plugins/pkg/PLIST-game
@@ -1,3 +1 @@
-@conflict nagios-plugins-game-*
-@pkgpath net/nagios/plugins,-game
 @bin libexec/nagios/check_game
diff --git a/net/monitoring-plugins/pkg/PLIST-ldap b/net/monitoring-plugins/pkg/PLIST-ldap
index 2f507b4a6b8..cd1f1555e8e 100644
--- a/net/monitoring-plugins/pkg/PLIST-ldap
+++ b/net/monitoring-plugins/pkg/PLIST-ldap
@@ -1,4 +1,2 @@
-@conflict nagios-plugins-ldap-*
-@pkgpath net/nagios/plugins,-ldap
 @bin libexec/nagios/check_ldap
 libexec/nagios/check_ldaps
diff --git a/net/monitoring-plugins/pkg/PLIST-main b/net/monitoring-plugins/pkg/PLIST-main
index 004fe0684f1..60c13233286 100644
--- a/net/monitoring-plugins/pkg/PLIST-main
+++ b/net/monitoring-plugins/pkg/PLIST-main
@@ -1,13 +1,5 @@
 @conflict monitoring-plugins-samba-*
-@conflict nagios-plugins-*
-@conflict nagios-plugins-ntp-*
-@conflict nagios-plugins-samba-*
 @pkgpath net/monitoring-plugins,-samba
-@pkgpath net/nagios/plugins,-samba
-@pkgpath net/nagios/plugins
-@pkgpath net/nagios/plugins,-ntp
-@pkgpath net/nagios/plugins,-main
-@comment lib/charset.alias
 libexec/nagios/
 @bin libexec/nagios/check_apt
 @bin libexec/nagios/check_by_ssh
diff --git a/net/monitoring-plugins/pkg/PLIST-mysql b/net/monitoring-plugins/pkg/PLIST-mysql
index 146c8ad53f2..6c57713f7ab 100644
--- a/net/monitoring-plugins/pkg/PLIST-mysql
+++ b/net/monitoring-plugins/pkg/PLIST-mysql
@@ -1,4 +1,2 @@
-@conflict nagios-plugins-mysql-*
-@pkgpath net/nagios/plugins,-mysql
 @bin libexec/nagios/check_mysql
 @bin libexec/nagios/check_mysql_query
diff --git a/net/monitoring-plugins/pkg/PLIST-pgsql b/net/monitoring-plugins/pkg/PLIST-pgsql
index 73f0ec780ff..ce5d5a3222d 100644
--- a/net/monitoring-plugins/pkg/PLIST-pgsql
+++ b/net/monitoring-plugins/pkg/PLIST-pgsql
@@ -1,3 +1 @@
-@conflict nagios-plugins-pgsql-*
-@pkgpath net/nagios/plugins,-pgsql
 @bin libexec/nagios/check_pgsql
diff --git a/net/monitoring-plugins/pkg/PLIST-snmp b/net/monitoring-plugins/pkg/PLIST-snmp
index 2908e10a6da..804820e9f70 100644
--- a/net/monitoring-plugins/pkg/PLIST-snmp
+++ b/net/monitoring-plugins/pkg/PLIST-snmp
@@ -1,5 +1,3 @@
-@conflict nagios-plugins-snmp-*
-@pkgpath net/nagios/plugins,-snmp
 libexec/nagios/check_breeze
 @bin libexec/nagios/check_hpjd
 libexec/nagios/check_ifoperstatus