diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index b07ed8b0f..283a6d312 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,5 +1,5 @@
 PLUGIN_NAME=		nginx
-PLUGIN_VERSION=		1.17
+PLUGIN_VERSION=		1.18
 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 d551d2e78..52e4e8e0d 100644
--- a/www/nginx/pkg-descr
+++ b/www/nginx/pkg-descr
@@ -8,6 +8,11 @@ reuse, SSL offload and HTTP media streaming.
 Plugin Changelog
 ================
 
+1.18
+
+* Add proxy header for CloudFlare
+
+
 1.17
 
 * allow to set worker_processes and worker_connections (contributed by ibanezbass in #1621)
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 08f7f9980..06a471a39 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
@@ -659,6 +659,7 @@
           <X-Real-IP>X-Real-IP (default)</X-Real-IP>
           <X-Forwarded-For>X-Forwarded-For</X-Forwarded-For>
           <proxy_protocol>PROXY Protocol</proxy_protocol>
+          <CF-Connecting-IP>CloudFlare Connecting IP</CF-Connecting-IP>
         </OptionValues>
         <Required>N</Required>
       </real_ip_source>