diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index da37a42fe..db9a2d80e 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,5 @@
 PLUGIN_NAME=		nginx
-PLUGIN_VERSION=		1.8
-PLUGIN_REVISION=	1
+PLUGIN_VERSION=		1.9
 PLUGIN_COMMENT=		Nginx HTTP server and reverse proxy
 PLUGIN_DEPENDS=		nginx
 PLUGIN_MAINTAINER=	franz.fabian.94@gmail.com
diff --git a/www/nginx/pkg-descr b/www/nginx/pkg-descr
index db8482be7..a8edd27c2 100644
--- a/www/nginx/pkg-descr
+++ b/www/nginx/pkg-descr
@@ -8,6 +8,10 @@ reuse, SSL offload and HTTP media streaming.
 Plugin Changelog
 ================
 
+1.9
+
+* add advanced options to configure hostname hash sizes for long hostnames
+
 1.8
 
 * update lodash to v4.17.11
diff --git a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
index 1b72b18da..c8bf3cd69 100644
--- a/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
+++ b/www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/settings.xml
@@ -27,6 +27,18 @@
                 <type>text</type>
                 <help>This content type is sent if the file extension is unknown.</help>
             </field>
+            <field>
+                <id>nginx.http.server_names_hash_bucket_size</id>
+                <label>Hash Bucket Size</label>
+                <type>text</type>
+                <advanced>true</advanced>
+            </field>
+            <field>
+                <id>nginx.http.server_names_hash_max_size</id>
+                <label>Server Names Hash Max Size</label>
+                <type>text</type>
+                <advanced>true</advanced>
+            </field>
         </subtab>
         <subtab id="nginx-general-webgui" description="GUI Settings">
             <field>
diff --git a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
index eb2adfc3f..2a1c4999e 100644
--- a/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
+++ b/www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
@@ -29,6 +29,14 @@
       <default_type type="TextField">
         <Required>N</Required>
       </default_type>
+      <server_names_hash_bucket_size type="IntegerField">
+        <Required>N</Required>
+        <MinimumValue>1</MinimumValue>
+      </server_names_hash_bucket_size>
+      <server_names_hash_max_size type="IntegerField">
+        <Required>N</Required>
+        <MinimumValue>1</MinimumValue>
+      </server_names_hash_max_size>
     </http>
 
     <userlist type="ArrayField">
diff --git a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf
index 6de081774..ad48d8724 100644
--- a/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf
+++ b/www/nginx/src/opnsense/service/templates/OPNsense/Nginx/http.conf
@@ -29,6 +29,12 @@ default_type {{ OPNsense.Nginx.http.default_type }};
 {% else %}
 default_type  application/octet-stream;
 {% endif %}
+{% if OPNsense.Nginx.http.server_names_hash_max_size is defined and OPNsense.Nginx.http.server_names_hash_max_size != '' %}
+server_names_hash_max_size {{ OPNsense.Nginx.http.server_names_hash_max_size }};
+{% endif %}
+{% if OPNsense.Nginx.http.server_names_hash_bucket_size is defined and OPNsense.Nginx.http.server_names_hash_bucket_size != '' %}
+server_names_hash_bucket_size {{ OPNsense.Nginx.http.server_names_hash_bucket_size }};
+{% endif %}
 {% if OPNsense.Nginx.http.keepalive_timeout is defined and OPNsense.Nginx.http.keepalive_timeout != '' %}
 keepalive_timeout {{ OPNsense.Nginx.http.keepalive_timeout }};
 {% endif %}