diff --git a/CHANGELOG b/CHANGELOG
index d3e28dcfc766e79bfa1dfe356aac2bb4e7e01be9..cb5a5662827aa08869d66a93e577bfc5a6c25640 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,6 +10,7 @@ v 8.6.0 (unreleased)
 v 8.5.2
   - Fix sidebar overlapping content when screen width was below 1200px
   - Fix error 500 when commenting on a commit
+  - Fix broken icons on installations with relative URL (Artem Sidorenko)
 
 v 8.5.1
   - Fix group projects styles
diff --git a/Rakefile b/Rakefile
index 35b2f05cbb4566b71b34554cf184a9d0bd9d46d6..5dd389d5678e1e7aeb90b4c879d1dbe150b96b40 100755
--- a/Rakefile
+++ b/Rakefile
@@ -4,4 +4,7 @@
 
 require File.expand_path('../config/application', __FILE__)
 
+relative_url_conf = File.expand_path('../config/initializers/relative_url', __FILE__)
+require relative_url_conf if File.exist?("#{relative_url_conf}.rb")
+
 Gitlab::Application.load_tasks