diff --git a/README.md b/README.md
index bfb18a3da..2a5b24cc9 100644
--- a/README.md
+++ b/README.md
@@ -78,6 +78,7 @@ security/tor -- The Onion Router
 sysutils/api-backup -- Provide the functionality to download the config.xml
 sysutils/boot-delay -- Apply a persistent 10 second boot delay
 sysutils/lcdproc-sdeclcd -- LCDProc for SDEC LCD devices
+sysutils/mail-backup -- Send configuration file backup by e-mail
 sysutils/node_exporter -- Prometheus exporter for machine metrics
 sysutils/nut -- Network UPS Tools
 sysutils/smart -- SMART tools
diff --git a/mail/backup_mailer/Makefile b/mail/backup_mailer/Makefile
deleted file mode 100644
index e4bbaa9c9..000000000
--- a/mail/backup_mailer/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-PLUGIN_NAME=		email-config-backup
-PLUGIN_VERSION=		1.0
-PLUGIN_COMMENT=		Send global configuration file backup by email
-PLUGIN_DEPENDS=		gnupg phpmailer
-PLUGIN_MAINTAINER=	machadovilaca@gmail.com
-
-.include "../../Mk/plugins.mk"
diff --git a/sysutils/mail-backup/Makefile b/sysutils/mail-backup/Makefile
new file mode 100644
index 000000000..36bb2ceb8
--- /dev/null
+++ b/sysutils/mail-backup/Makefile
@@ -0,0 +1,8 @@
+PLUGIN_NAME=		mail-backup
+PLUGIN_VERSION=		0.1
+PLUGIN_COMMENT=		Send configuration file backup by e-mail
+PLUGIN_DEPENDS=		gnupg phpmailer
+PLUGIN_MAINTAINER=	machadovilaca@gmail.com
+PLUGIN_DEVEL=		yes
+
+.include "../../Mk/plugins.mk"
diff --git a/mail/backup_mailer/src/opnsense/mvc/app/library/OPNsense/Backup/Mailer.php b/sysutils/mail-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Mailer.php
similarity index 100%
rename from mail/backup_mailer/src/opnsense/mvc/app/library/OPNsense/Backup/Mailer.php
rename to sysutils/mail-backup/src/opnsense/mvc/app/library/OPNsense/Backup/Mailer.php
diff --git a/mail/backup_mailer/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.php b/sysutils/mail-backup/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.php
similarity index 100%
rename from mail/backup_mailer/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.php
rename to sysutils/mail-backup/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.php
diff --git a/mail/backup_mailer/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.xml b/sysutils/mail-backup/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.xml
similarity index 100%
rename from mail/backup_mailer/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.xml
rename to sysutils/mail-backup/src/opnsense/mvc/app/models/OPNsense/Backup/MailerSettings.xml