diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 33be3232f..eff06a127 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		nut
 PLUGIN_VERSION=		1.6
-PLUGIN_REVISION=        1
+PLUGIN_REVISION=        2
 PLUGIN_COMMENT=		Network UPS Tools
 PLUGIN_DEPENDS=		nut
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml
index ac8c908eb..e9bdf73de 100644
--- a/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml
+++ b/sysutils/nut/src/opnsense/mvc/app/models/OPNsense/Nut/Nut.xml
@@ -19,6 +19,8 @@
       <name type="TextField">
         <default>UPSName</default>
         <Required>Y</Required>
+        <mask>/^([0-9a-zA-Z._\-]){1,128}$/u</mask>
+        <ValidationMessage>The name should only contain alphanumeric characters, dashes, underscores or a dot.</ValidationMessage>
       </name>
       <listen type="CSVListField">
         <default>127.0.0.1,::1</default>