diff --git a/Changelog.md b/Changelog.md
index eac31c8ca53621aba3cfe56dcbd3ae1a6996a8d2..9e327dfe0e7aa3ec86e09344e937d993dbbe3fde 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -83,6 +83,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Extract user/profile discovery into the diaspora\_federation-rails gem [#6310](https://github.com/diaspora/diaspora/pull/6310)
 * Refactor PostPresenter [#6315](https://github.com/diaspora/diaspora/pull/6315)
 * Convert BackToTop to a backbone view [#6279](https://github.com/diaspora/diaspora/pull/6279) and [#6360](https://github.com/diaspora/diaspora/pull/6360)
+* Automatically follow the new HQ-Account [#6369](https://github.com/diaspora/diaspora/pull/6369)
 
 ## Bug fixes
 * Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
diff --git a/config/defaults.yml b/config/defaults.yml
index bf1e9de2259cfa5acf8d1ac07978e0379fa3bf56..9d4bd0d9c29bab48f51fa7d5b1e71b65d3ccb6e4 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -98,7 +98,7 @@ defaults:
     pod_name: 'diaspora*'
     enable_registrations: true
     autofollow_on_join: true
-    autofollow_on_join_user: 'diasporahq@joindiaspora.com'
+    autofollow_on_join_user: 'hq@pod.diaspora.software'
     welcome_message:
       enabled: false
       subject: 'Welcome Message'
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index c3bc0e0a3f171a1cf37a061a9dd6aae714da6a8d..c421cb3e21b31f468fe8b7607defdec6c76e26f9 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -404,11 +404,11 @@ configuration: ## Section
     ## follow an account upon creation.
     #autofollow_on_join: true
 
-    ## Auto-follow account (default='diasporahq@joindiaspora.com')
+    ## Auto-follow account (default='hq@pod.diaspora.software')
     ## The diaspora* HQ account keeps users up to date with news about Diaspora.
     ## If you set another auto-follow account (for example your podmin account),
     ## please consider resharing diaspora* HQ's posts for your pod's users!
-    #autofollow_on_join_user: 'diasporahq@joindiaspora.com'
+    #autofollow_on_join_user: 'hq@pod.diaspora.software'
 
     ## Welcome Message settings
     welcome_message: ##Section