diff --git a/Changelog.md b/Changelog.md
index 4515a2bb2c666603be5c3cbfc24a1820a4aace1b..675f428c23943cf8c57e7601650111815a264de3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@
 * 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 de412e61da28589654bd46bd7606946bf5763803..9039da389082c5161c616941febc89a6780c9f29 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -99,7 +99,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 269834c9a051e5dfab26f57920806aa71137bd98..64c38602b15b2af9b5fb3291ede49db12b1d86b3 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -408,11 +408,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