diff --git a/package.json b/package.json
index d5e2b2ba0d..4ab00d621c 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "A frontend for Home Assistant using the Polymer framework",
   "repository": {
     "type": "git",
-    "url": "https://github.com/balloob/home-assistant-polymer"
+    "url": "https://github.com/home-assistant/home-assistant-polymer"
   },
   "scripts": {
     "setup_js_dev": "git submodule init && git submodule update && cd home-assistant-js && npm install",
diff --git a/panels/dev-info/ha-panel-dev-info.html b/panels/dev-info/ha-panel-dev-info.html
index 7bcbdf4a40..5e147763b5 100644
--- a/panels/dev-info/ha-panel-dev-info.html
+++ b/panels/dev-info/ha-panel-dev-info.html
@@ -84,9 +84,9 @@
           <p>
             Published under the MIT license<br />
             Source:
-            <a href='https://github.com/balloob/home-assistant' target='_blank'>server</a> &mdash;
-            <a href='https://github.com/balloob/home-assistant-polymer' target='_blank'>frontend-ui</a> &mdash;
-            <a href='https://github.com/balloob/home-assistant-js' target='_blank'>frontend-core</a>
+            <a href='https://github.com/home-assistant/home-assistant' target='_blank'>server</a> &mdash;
+            <a href='https://github.com/home-assistant/home-assistant-polymer' target='_blank'>frontend-ui</a> &mdash;
+            <a href='https://github.com/home-assistant/home-assistant-js' target='_blank'>frontend-core</a>
           </p>
           <p>
             Built using