diff --git a/Changelog.md b/Changelog.md
index 980115556..9dd531150 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@
 
 ## 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 25e744d3c..6b4543012 100644
--- a/app/views/errors/error_500.haml
+++ b/app/views/errors/error_500.haml
@@ -8,3 +8,11 @@
   500: Internal server error.
 %h3
   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?