diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5c4b81..1c3a423 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
This project does not adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [v6.5.0-SNAPSHOT] - 2021-12-17
+
+Added possibility to customise feedback container URL and Label (Report an issue)
## [v6.4.0-SNAPSHOT] - 2017-01-24
diff --git a/pom.xml b/pom.xml
index f925fe3..a9e1594 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
generic-configurable-theme
war
generic-configurable-theme Theme
- 6.4.0-SNAPSHOT
+ 6.5.0-SNAPSHOT
D4Science Generic Configurable Liferay Theme
diff --git a/src/main/webapp/WEB-INF/liferay-look-and-feel.xml b/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
index 6dd7e2c..f28a834 100644
--- a/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
+++ b/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
@@ -17,6 +17,8 @@
+
+
+#if ($theme.getSetting("feedback-website-url") !="")
+ #set ($feedback-website-url = $theme.getSetting("feedback-website-url"))
+#else
+ #set ($feedback-website-url = "https//support.d4science.org")
+#end
+#if ($theme.getSetting("feedback-label") !="")
+ #set ($feedback-label = $theme.getSetting("feedback-label"))
+#else
+ #set ($feedback-label = "Report an issue")
+#end
+
@@ -104,7 +115,7 @@ $theme.include($body_top_include)
#dockbar()
#if($is_signed_in)
-
+
#end