diff --git a/CHANGELOG.md b/CHANGELOG.md
index 062ec40..1ede450 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,11 @@
 cookbook-webui CHANGELOG
 ===============
 
+## 1.5.0
+
+  - Rafa Gómez
+    - [d9897b8] Add custom error page handling for 504 errors in webui configuration (#87)
+
 ## 1.4.2
 
   - Rafael Gomez
diff --git a/resources/metadata.rb b/resources/metadata.rb
index 9b9c9c9..22ef77c 100644
--- a/resources/metadata.rb
+++ b/resources/metadata.rb
@@ -5,4 +5,4 @@
 maintainer_email 'git@redborder.com'
 license          'AGPL-3.0'
 description      'Installs/Configures cookbook-webui'
-version          '1.4.2'
+version          '1.5.0'
diff --git a/resources/templates/default/webui.conf.erb b/resources/templates/default/webui.conf.erb
index 7b7caab..b197733 100644
--- a/resources/templates/default/webui.conf.erb
+++ b/resources/templates/default/webui.conf.erb
@@ -46,6 +46,8 @@ server {
     proxy_buffers              4 256k;
     proxy_busy_buffers_size    256k;
     proxy_temp_file_write_size 256k;
+    
+    error_page 504 = /504;
 
     location ~ "^/(?:stylesheets|javascripts|images|flash|facebox|css|favicon|robots|humans)/{0,1}.*$" {
       if ($request_method !~ ^(GET)$ ) {