diff --git a/Changelog.md b/Changelog.md
index 54d220e13..75d4f6956 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -110,6 +110,7 @@ Contributions are very welcome, the hard work is done!
 
 ## Features
 * Keyboard shortcuts now do work on profile pages as well [#6647](https://github.com/diaspora/diaspora/pull/6647/files)
+* Add the podmin email address to 500 errors [#6652](https://github.com/diaspora/diaspora/pull/6652)
 
 # 0.5.6.1
 
diff --git a/app/views/errors/error_500.haml b/app/views/errors/error_500.haml
index eb88e7eda..d566b86ca 100644
--- a/app/views/errors/error_500.haml
+++ b/app/views/errors/error_500.haml
@@ -7,6 +7,10 @@
   Internal server error.
   Our bad! Sorry about that. :(
 
+- if AppConfig.admins.podmin_email?
+  %p
+    Drop us an email to <a href="mailto:#{AppConfig.admins.podmin_email}">#{AppConfig.admins.podmin_email}</a>.
+
 %p
   %a{href: "javascript:history.back()"}
     Go Back?