diff --git a/archiva-docs/src/site/apt/release-notes.apt.vm b/archiva-docs/src/site/apt/release-notes.apt.vm
index c650c146a..7085e7367 100644
--- a/archiva-docs/src/site/apt/release-notes.apt.vm
+++ b/archiva-docs/src/site/apt/release-notes.apt.vm
@@ -32,7 +32,7 @@ Release Notes for Archiva ${project.version}
 
     * the web site: {{http://archiva.apache.org/}}
 
-    * the archiva-user mailing list: {{http://archiva.apache.org/mail-lists.html}}
+    * the archiva-user mailing list: {{http://archiva.apache.org/mailing-lists.html}}
 
 * New in Archiva ${project.version}
 
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/security.properties b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/security.properties
index 2074ef020..3a59dc847 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/security.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/security.properties
@@ -24,4 +24,4 @@
 email.validation.subject=Welcome to Archiva
 
 # Feedback page
-email.feedback.path=http://archiva.apache.org/mail-lists.html
+email.feedback.path=https://archiva.apache.org/mailing-lists.html
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/redback-security.properties b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/redback-security.properties
index bb883b18a..a870220e8 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/redback-security.properties
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/redback-security.properties
@@ -24,6 +24,6 @@
 email.validation.subject=Welcome to Archiva
 
 # Feedback page
-email.feedback.path=http://archiva.apache.org/mail-lists.html
+email.feedback.path=https://archiva.apache.org/mailing-lists.html
 
-email.url.path=index.html
\ No newline at end of file
+email.url.path=index.html
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/archiva/redback-security.properties b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/archiva/redback-security.properties
index e805ce998..5e17a245c 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/archiva/redback-security.properties
+++ b/archiva-modules/archiva-web/archiva-webapp/src/test/resources/org/apache/archiva/redback-security.properties
@@ -24,9 +24,9 @@
 email.validation.subject=Welcome to Archiva
 
 # Feedback page
-email.feedback.path=http://archiva.apache.org/mail-lists.html
+email.feedback.path=http://archiva.apache.org/mailing-lists.html
 
 email.url.path=index.html
 
 
-rest.csrffilter.enabled=false
\ No newline at end of file
+rest.csrffilter.enabled=false