diff --git a/MAVProxy/modules/mavproxy_help.py b/MAVProxy/modules/mavproxy_help.py
index 0d6493a277932b0d76d934f021ddc3e289420800..7d8364fc84d38a21c773a3fd25916348d37b90f8 100644
--- a/MAVProxy/modules/mavproxy_help.py
+++ b/MAVProxy/modules/mavproxy_help.py
@@ -76,7 +76,7 @@ class HelpModule(mp_module.MPModule):
         if mp_util.has_wxpython:
             self.menu_added_console = False
             self.menu = MPMenuSubMenu('Help',
-                                  items=[MPMenuItem('MAVProxy website', 'MAVProxy website', '', handler=MPMenuOpenWeblink('http://dronecode.github.io/MAVProxy/')),
+                                  items=[MPMenuItem('MAVProxy website', 'MAVProxy website', '', handler=MPMenuOpenWeblink('http://ardupilot.github.io/MAVProxy/')),
                                          MPMenuItem('Check for Updates', 'Check for Updates', '', handler=MPMenuChildMessageDialog(title="Updates", message=self.newversion)),
                                          MPMenuItem('About', 'About', '', handler=MPMenuChildMessageDialog(title="About MAVProxy", message="MAVProxy Version " + self.version + "\nOS: " + self.host + "\nPython " +  self.pythonversion + "\nWXPython " + self.wxVersion))])
 
@@ -102,7 +102,7 @@ class HelpModule(mp_module.MPModule):
         if args[0] == "about":
             print("MAVProxy Version " + self.version + "\nOS: " + self.host + "\nPython " +  self.pythonversion)
         elif args[0] == "site":
-            print("See http://dronecode.github.io/MAVProxy/ for documentation")
+            print("See http://ardupilot.github.io/MAVProxy/ for documentation")
         else:
             self.print_usage()
 
diff --git a/README.md b/README.md
index fdbf614872bfbaa78077d9536230ad83d476ccbf..acbd2780826d18b644f1830cf8b96a57a971a663 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ MAVProxy
 
 This is a MAVLink ground station written in python. 
 
-Please see http://Dronecode.github.io/MAVProxy/ for more information
+Please see http://ardupilot.github.io/MAVProxy/ for more information
 
 This ground station was developed as part of the CanberraUAV OBC team
 entry
@@ -12,4 +12,4 @@ License
 
 MAVProxy is released under the GNU General Public License v3 or later
 
-[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Dronecode/MAVProxy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/ArduPilot/MAVProxy?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
diff --git a/setup.py b/setup.py
index 5eb06d8fa445f5b9dba18e5878670e77e7cdec13..44753ff4df3090053f9017b3bbdf4e52e16099cc 100644
--- a/setup.py
+++ b/setup.py
@@ -30,9 +30,9 @@ control modules. MAVProxy is extensible via a modules system - see the modules
 subdirectory for some example modules. MAVProxy was developed by CanberraUAV
 for use in the 2012 Outback Challenge, and includes a module for the
 CanberraUAV search and rescue system. See
-http://Dronecode.github.io/MAVProxy/ for more information
+http://ardupilot.github.io/MAVProxy/ for more information
 on how to use MAVProxy.''',
-      url='https://github.com/Dronecode/MAVProxy',
+      url='https://github.com/ArduPilot/MAVProxy',
       author='Andrew Tridgell',
       author_email='andrew@tridgell.net',
       classifiers=[
diff --git a/windows/mavproxy.iss b/windows/mavproxy.iss
index c23592a12d9bf1d776966c1f392057d0956ea4d0..3e928f50ea78698c409a3e921bafc6d4a1dc9a43 100644
--- a/windows/mavproxy.iss
+++ b/windows/mavproxy.iss
@@ -6,7 +6,7 @@
 ; Note MyAppVersion is defined in MAVProxyWinBuild.bat
 ; #define MyAppVersion {code:GetVersion}
 #define MyAppPublisher "Andrew Tridgell"
-#define MyAppURL "http://Dronecode.github.io/MAVProxy"
+#define MyAppURL "http://ardupilot.github.io/MAVProxy"
 #define MyAppExeName "mavproxy.exe"
 
 [Setup]
@@ -50,7 +50,7 @@ Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
 Name: "{group}\MAVExplorer"; Filename: "{app}\MAVExplorer.exe"
 Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
 Name: "{group}\{cm:UninstallProgram, {#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{group}\Documentation"; Filename: "http://Dronecode.github.io/MAVProxy/"
+Name: "{group}\Documentation"; Filename: "http://ardupilot.github.io/MAVProxy/"
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent