diff --git a/README.md b/README.md
index ab36cd05b..6210ba314 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ We are currently maintaining [a working protoype](https://threatdragon.org) in s
 There are installers available for both Windows and Mac OSX, as well as rpm and debian packages for Linux.
 Note that for the desktop variant the models are stored on the local filesystem rather than a remote repository.
 
-[End user help](http://docs.threatdragon.org/) is available for both variants.
+[End user help](https://threatdragon.github.io) is available for both variants.
 
 This repository contains the files for the web application variant.
 
diff --git a/package.json b/package.json
index e1d59219d..6ba4d9ac5 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "email": "mike.goodwin@owasp.org"
   },
   "license": "Apache-2.0",
-  "homepage": "http://docs.threatdragon.org/",
+  "homepage": "https://threatdragon.github.io/",
   "repository": {
     "type": "git",
     "url": "git://github.com/owasp/threat-dragon.git"
diff --git a/td/public/app/layout/topnav.html b/td/public/app/layout/topnav.html
index ebbe23ece..e5b90322f 100644
--- a/td/public/app/layout/topnav.html
+++ b/td/public/app/layout/topnav.html
@@ -20,7 +20,7 @@
                     <button class="btn btn-primary" type="submit">
                         <i class="fa fa-sign-out fa-2x icon-align" title="Log out"></i>
                     </button>
-                    <a class="btn btn-primary" href="http://docs.threatdragon.org/" target="_blank">
+                    <a class="btn btn-primary" href="https://threatdragon.github.io/" target="_blank">
                         <i title="View documentation" class="fa fa-question-circle fa-2x"></i>
                     </a>
                     <a class="btn btn-primary" href="https://cheatsheetseries.owasp.org/cheatsheets/Threat_Modeling_Cheat_Sheet.html" target="_blank">
diff --git a/td/views/login.pug b/td/views/login.pug
index b65c9b429..9b142111c 100644
--- a/td/views/login.pug
+++ b/td/views/login.pug
@@ -22,9 +22,9 @@ html(lang="en")
                     a.navbar-brand(href="/")
                         |Threat Dragon
                 .navbar-right
-                    a.btn.btn-primary(href="http://docs.threatdragon.org/",target="_blank")
+                    a.btn.btn-primary(href="https://threatdragon.github.io/",target="_blank")
                         span.fa.fa-question-circle.fa-2x(title="Get some help") 
-                    a.btn.btn-primary(href="https://github.com/owasp/threat-dragon",target="_blank")
+                    a.btn.btn-primary(href="https://github.com/OWASP/threat-dragon",target="_blank")
                         span.fa.fa-github.fa-2x(title="Visit us on GitHub")
                     a.btn.btn-primary(href="https://owasp.org/www-project-threat-dragon/",target="_blank",title="Visit the OWASP project page")
                         img(src="public/content/images/owasp.svg") 
@@ -41,7 +41,7 @@ html(lang="en")
                                     h1 Welcome!
                                     p
                                         |Threat Dragon is a free, open-source threat modeling tool from OWASP. 
-                                        |It can be used as a #[a(href="http://docs.threatdragon.org/#downloads",target="_blank") standalone desktop app] for Windows, MacOS and Linux 
+                                        |It can be used as a #[a(href="https://threatdragon.github.io/#downloads",target="_blank") standalone desktop app] for Windows, MacOS and Linux 
                                         |or as a web application. The desktop app is great if you want to try the application without giving it access to your GitHub repos,
                                         |but if you choose the online version you get to unleash the awesome power of GitHub on your threat models! 
                                         |Obviously, to do this you need to log in first...