diff --git a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
index 260987287..c49bd0c94 100644
--- a/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
+++ b/gui/builtinPreferenceViews/pyfaUpdatePreferences.py
@@ -96,7 +96,7 @@ class PFUpdatePref (PreferenceView):
         self.resetButton.Hide()
 
     def OnDownload(self, event):
-        wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/releases/tag/'+self.UpdateSettings.get('version'))
+        wx.LaunchDefaultBrowser('https://github.com/pyfa-org/Pyfa/releases/tag/'+self.UpdateSettings.get('version'))
 
     def getImage(self):
         return BitmapLoader.getBitmap("prefs_update", "gui")
diff --git a/gui/mainFrame.py b/gui/mainFrame.py
index 23cc8146c..040872d64 100644
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -341,9 +341,9 @@ class MainFrame(wx.Frame):
                                      "\nSQLAlchemy: \t" + sqlalchemy.__version__,
             700, wx.ClientDC(self))
         if "__WXGTK__" in  wx.PlatformInfo:
-            forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=247609"
+            forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425"
         else:
-            forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=247609"
+            forumUrl = "http://forums.eveonline.com/default.aspx?g=posts&t=466425"
         info.WebSite = (forumUrl, "pyfa thread at EVE Online forum")
         wx.AboutBox(info)
 
@@ -397,10 +397,10 @@ class MainFrame(wx.Frame):
         dlg.ShowModal()
 
     def goWiki(self, event):
-        webbrowser.open('https://github.com/DarkFenX/Pyfa/wiki')
+        webbrowser.open('https://github.com/pyfa-org/Pyfa/wiki')
 
     def goForums(self, event):
-        webbrowser.open('https://forums.eveonline.com/default.aspx?g=posts&t=247609')
+        webbrowser.open('https://forums.eveonline.com/default.aspx?g=posts&t=466425')
 
     def registerMenu(self):
         menuBar = self.GetMenuBar()
diff --git a/gui/pyfatogglepanel.py b/gui/pyfatogglepanel.py
index 14bd9e2f3..765a07727 100644
--- a/gui/pyfatogglepanel.py
+++ b/gui/pyfatogglepanel.py
@@ -5,7 +5,7 @@
 ##
 ## Author: Darriele - HomeWorld
 ##
-## Project home: http://github.com/DarkFenX/Pyfa - pyfa project
+## Project home: https://github.com/pyfa-org/Pyfa - pyfa project
 ## Some portions of code are based on
 ## AGW:pycollapsiblepane generic implementation of wx.CollapsiblePane
 ## AGW:pycollapsiblepane credits ( from the original source file used ):
diff --git a/gui/updateDialog.py b/gui/updateDialog.py
index 7dfe73790..0febdf3f8 100644
--- a/gui/updateDialog.py
+++ b/gui/updateDialog.py
@@ -116,5 +116,5 @@ class UpdateDialog(wx.Dialog):
             self.UpdateSettings.set('version', None)
 
     def OnDownload(self, e):
-        wx.LaunchDefaultBrowser('https://github.com/DarkFenX/Pyfa/releases/tag/'+self.releaseInfo['tag_name'])
+        wx.LaunchDefaultBrowser('https://github.com/pyfa-org/Pyfa/releases/tag/'+self.releaseInfo['tag_name'])
         self.OnClose(e)
diff --git a/scripts/pyfa-setup.iss b/scripts/pyfa-setup.iss
index 235ed06f1..4980c6b65 100644
--- a/scripts/pyfa-setup.iss
+++ b/scripts/pyfa-setup.iss
@@ -15,7 +15,7 @@
 
 #define MyAppName "pyfa"
 #define MyAppPublisher "pyfa"
-#define MyAppURL "https://forums.eveonline.com/default.aspx?g=posts&t=247609&p=1"
+#define MyAppURL "https://forums.eveonline.com/default.aspx?g=posts&t=466425&p=1"
 #define MyAppExeName "pyfa.exe"
 
 ; What version starts with the new structure (1.x.0). This is used to determine if we run directory structure cleanup
@@ -53,7 +53,7 @@ SetupIconFile={#MyAppDir}\pyfa.ico
 Compression=lzma
 SolidCompression=yes
 CloseApplications=yes
-AppReadmeFile=https://github.com/DarkFenX/Pyfa/blob/v{#MyAppVersion}/readme.txt
+AppReadmeFile=https://github.com/pyfa-org/Pyfa/blob/v{#MyAppVersion}/readme.txt
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
diff --git a/service/update.py b/service/update.py
index cb37a129a..47a3e35b0 100644
--- a/service/update.py
+++ b/service/update.py
@@ -37,7 +37,7 @@ class CheckUpdateThread(threading.Thread):
         network = service.Network.getInstance()
 
         try:
-            response = network.request('https://api.github.com/repos/DarkFenX/Pyfa/releases', network.UPDATE)
+            response = network.request('https://api.github.com/repos/pyfa-org/Pyfa/releases', network.UPDATE)
             jsonResponse = json.loads(response.read())
             jsonResponse.sort(key=lambda x: calendar.timegm(dateutil.parser.parse(x['published_at']).utctimetuple()), reverse=True)