diff --git a/README.md b/README.md
index 95bb58170..6d2249264 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ This is Frets on Fire X, a highly customizable rhythm game supporting many modes
 - repository: http://github.com/fofix/fofix
 - IRC: #fofix on oftc.net ([web interface](https://webchat.oftc.net/))
 - Gitter: [web interface](https://gitter.im/fofix/fofix)
-- unofficial forum: http://www.fretsonfire.net/forums/viewforum.php?f=32
+- unofficial forum: https://www.fretsonfire.org/forums/viewforum.php?f=32
 
 
 Setup
diff --git a/doc/source/quickstart/quickstart.rst b/doc/source/quickstart/quickstart.rst
index 90a4526bd..ba2894b97 100644
--- a/doc/source/quickstart/quickstart.rst
+++ b/doc/source/quickstart/quickstart.rst
@@ -31,7 +31,7 @@ Some themes are already included:
     - MegaLight V4
     - Uberlight
 
-To find other themes, go to the `forum <http://www.fretsonfire.net/forums/viewforum.php?f=11&sid=152eb4b9177971b82d8cd410faa7586b>`_ or create them.
+To find other themes, go to the `forum <https://www.fretsonfire.org/forums/viewtopic.php?f=32&t=24976>`_ or create them.
 
 
 Start the game
diff --git a/doc/source/users/songs.rst b/doc/source/users/songs.rst
index 86469bc3f..e4fb9cb1f 100644
--- a/doc/source/users/songs.rst
+++ b/doc/source/users/songs.rst
@@ -36,7 +36,7 @@ Tools
 
 Some tools will help you creating a song for FoFiX:
 
-- `EOF <http://www.t3-i.com/pages/project.php?id=eof>`_ - `unofficial guide <http://www.fretsonfire.net/forums/viewtopic.php?t=1938>`_
+- `EOF <http://www.t3-i.com/pages/project.php?id=eof>`_ - `unofficial guide <https://www.fretsonfire.org/forums/viewtopic.php?f=34&t=1938>`_
 
 
 INI file
diff --git a/doc/source/users/themes.rst b/doc/source/users/themes.rst
index 2306b4597..9ebe79323 100644
--- a/doc/source/users/themes.rst
+++ b/doc/source/users/themes.rst
@@ -4,7 +4,7 @@ Themes
 Additional themes
 -----------------
 
-You can find a list of additional themes for FoFiX on the `forum <http://www.fretsonfire.net/forums/viewtopic.php?f=32&t=24976>`_.
+You can find a list of additional themes for FoFiX on the `forum <https://www.fretsonfire.org/forums/viewtopic.php?f=32&t=24976>`_.
 
 
 Installation
diff --git a/fofix/core/GameEngine.py b/fofix/core/GameEngine.py
index 954e22246..f7c191c74 100644
--- a/fofix/core/GameEngine.py
+++ b/fofix/core/GameEngine.py
@@ -98,7 +98,7 @@ def _init_allthemes():
         defaultTheme = themes[0]    #myfingershurt
 
     #myfingershurt: default theme must be an existing one!
-    Config.define("coffee", "themename",           str,   defaultTheme,      text = _("Theme"),                options = dict([(str(themes[n]),themes[n]) for n in range(0, i)]), tipText = _("Sets the overall graphical feel of the game. You can find and download many more at fretsonfire.net"))
+    Config.define("coffee", "themename",           str,   defaultTheme,      text = _("Theme"),                options = dict([(str(themes[n]),themes[n]) for n in range(0, i)]), tipText = _("Sets the overall graphical feel of the game. You can find and download many more at https://fretsonfire.org"))
 _init_allthemes()
 
 Player.loadControls()
diff --git a/fofix/game/Credits.py b/fofix/game/Credits.py
index bcdf8dd02..c439efcbf 100644
--- a/fofix/game/Credits.py
+++ b/fofix/game/Credits.py
@@ -148,7 +148,7 @@ def __init__(self, engine):
         self.bank['honorary']   = [_("Honorary Credits")]
         self.bank['codeHonor']  = [_("Without whom this game would not exist")]
         self.bank['giveThanks'] = [_("Special Thanks to")]
-        self.bank['community']  = [_("nwru and all of the community at fretsonfire.net")]
+        self.bank['community']  = [_("nwru and all of the community at https://fretsonfire.org")]
         self.bank['other']      = [_("Other Contributors:")]
         self.bank['tutorial']   = [_("Jurgen FoF tutorial inspired by adam02"),
                                    _("Drum test song tutorial by Heka"),