diff --git a/src/core/hs_set.c b/src/core/hs_set.c
index 911ad7c1e..4cbc30afa 100644
--- a/src/core/hs_set.c
+++ b/src/core/hs_set.c
@@ -119,8 +119,8 @@ int myDoSet(User * u)
             return MOD_CONT;
         }
     }
-    if (strlen(rawhostmask) < HOSTMAX - 1)
-        snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask);
+    if (strlen(rawhostmask) < HOSTMAX)
+        snprintf(hostmask, HOSTMAX, "%s", rawhostmask);
     else {
         notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
         if (vIdent) {
diff --git a/src/core/hs_setall.c b/src/core/hs_setall.c
index 6942191db..a7aad270a 100644
--- a/src/core/hs_setall.c
+++ b/src/core/hs_setall.c
@@ -122,8 +122,8 @@ int do_setall(User * u)
         }
     }
 
-    if (strlen(rawhostmask) < HOSTMAX - 1)
-        snprintf(hostmask, HOSTMAX - 1, "%s", rawhostmask);
+    if (strlen(rawhostmask) < HOSTMAX)
+        snprintf(hostmask, HOSTMAX, "%s", rawhostmask);
     else {
         notice_lang(s_HostServ, u, HOST_SET_TOOLONG, HOSTMAX);
         if (vIdent) {
diff --git a/version.log b/version.log
index 1084719ea..296fdacc9 100644
--- a/version.log
+++ b/version.log
@@ -9,7 +9,7 @@ VERSION_MAJOR="1"
 VERSION_MINOR="8"
 VERSION_PATCH="3"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="2811"
+VERSION_BUILD="2813"
 
 # $Log$ # Changes since 1.8.3 Release