diff --git a/README.md b/README.md
index c9daf93c..c172a7fd 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ of the License, or (at your option) any later version.
 * Project homepage: http://getontracks.org/
 * Manual: http://getontracks.org/manual/
 * Source at GitHub: https://github.com/TracksApp/tracks
-* Assembla space (for bug reports and feature requests): https://www.assembla.com/spaces/tracks-tickets/tickets
+* Bug reports and feature requests: https://github.com/TracksApp/tracks/issues
 * Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki
 * Forum (read-only): http://getontracks.org/forums/
 * Mailing list: http://groups.google.com/group/TracksApp
diff --git a/app/views/shared/_footer.html.erb b/app/views/shared/_footer.html.erb
index 063c55c4..abada43a 100644
--- a/app/views/shared/_footer.html.erb
+++ b/app/views/shared/_footer.html.erb
@@ -1,5 +1,5 @@
 <div id="footer">
-  <p><%= t('footer.send_feedback', :version => TRACKS_VERSION) %>: <a href="https://www.assembla.com/spaces/tracks-tickets/tickets"><%= t('common.bugs')%></a> |
+  <p><%= t('footer.send_feedback', :version => TRACKS_VERSION) %>: <a href="https://github.com/TracksApp/tracks/issues"><%= t('common.bugs')%></a> |
     <a href="https://github.com/TracksApp/tracks/wiki"><%= t('common.wiki')%></a> |
     <a href="http://groups.google.com/group/TracksApp"><%= t('common.mailing_list')%></a> |
     <a href="http://getontracks.org/"><%= t('common.website')%></a> |
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 79cde7e8..8ad01809 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -3,7 +3,7 @@
 * Project homepage: http://getontracks.org/
 * Manual: http://getontracks.org/manual/
 * Source at GitHub: https://github.com/TracksApp/tracks
-* Assembla space (for bug reports and feature requests): https://www.assembla.com/spaces/tracks-tickets/tickets
+* Bug reports and feature requests: https://github.com/TracksApp/tracks/issues
 * Wiki (community contributed information): https://github.com/TracksApp/tracks/wiki
 * Forum (read-only): http://getontracks.org/forums/
 * Mailing list: http://groups.google.com/group/TracksApp