diff --git a/source/getting-started/autostart-systemd.markdown b/source/getting-started/autostart-systemd.markdown
index 9cfccf45ab0..a2fdeedfb14 100644
--- a/source/getting-started/autostart-systemd.markdown
+++ b/source/getting-started/autostart-systemd.markdown
@@ -35,10 +35,10 @@ WantedBy=multi-user.target
 EOF'
 ```
 
-There is also another [sample service file](https://raw.githubusercontent.com/balloob/home-assistant/master/script/home-assistant%40.service) available. To use this one, just download it.
+There is also another [sample service file](https://raw.githubusercontent.com/home-assistant/home-assistant/master/script/home-assistant%40.service) available. To use this one, just download it.
 
 ```bash
-$ sudo wget https://raw.githubusercontent.com/balloob/home-assistant/master/script/home-assistant%40.service -O /lib/systemd/system/home-assistant@[your user].service
+$ sudo wget https://raw.githubusercontent.com/home-assistant/home-assistant/master/script/home-assistant%40.service -O /lib/systemd/system/home-assistant@[your user].service
 ```
 
 You need to reload `systemd` to make the daemon aware of the new configuration. Enable and launch Home Assistant after that.
diff --git a/source/getting-started/installation-docker.markdown b/source/getting-started/installation-docker.markdown
index 41c555de174..be7924d49cd 100644
--- a/source/getting-started/installation-docker.markdown
+++ b/source/getting-started/installation-docker.markdown
@@ -28,7 +28,7 @@ If you run into any issues, please see [the troubleshooting page](/getting-start
 In addition to this site, check out these sources for additional help:
 
  - [Forum](https://community.home-assistant.io) for Home Assistant discussions and questions.
- - [Gitter Chat Room](https://gitter.im/balloob/home-assistant) for real-time chat about Home Assistant.
+ - [Gitter Chat Room](https://gitter.im/home-assistant/home-assistant) for real-time chat about Home Assistant.
  - [GitHub Page](https://github.com/home-assistant/home-assistant/issues) for issue reporting.
 
 ### [Next step: Configuring Home Assistant »](/getting-started/configuration/)
diff --git a/source/getting-started/installation-raspberry-pi.markdown b/source/getting-started/installation-raspberry-pi.markdown
index 5cc49c1c008..5262bc93fbd 100644
--- a/source/getting-started/installation-raspberry-pi.markdown
+++ b/source/getting-started/installation-raspberry-pi.markdown
@@ -38,7 +38,7 @@ If you run into any issues, please see [the troubleshooting page](/getting-start
 In addition to this site, check out these sources for additional help:
 
  - [Forum](https://community.home-assistant.io) for Home Assistant discussions and questions.
- - [Gitter Chat Room](https://gitter.im/balloob/home-assistant) for real-time chat about Home Assistant.
+ - [Gitter Chat Room](https://gitter.im/home-assistant/home-assistant) for real-time chat about Home Assistant.
  - [GitHub Page](https://github.com/home-assistant/home-assistant/issues) for issue reporting.
 
 ### {% linkable_title What's next %}
diff --git a/source/help/index.markdown b/source/help/index.markdown
index 57b31e80dd3..bb219c631a2 100644
--- a/source/help/index.markdown
+++ b/source/help/index.markdown
@@ -14,7 +14,7 @@ There are various ways to get in touch with the Home Assistant community. It doe
 ### {% linkable_title Communication channels %} 
 
  - [Forum](https://community.home-assistant.io/)
- - [Gitter Chatroom](https://gitter.im/balloob/home-assistant) for general Home Assistant discussions and questions.
+ - [Gitter Chatroom](https://gitter.im/home-assistant/home-assistant) for general Home Assistant discussions and questions.
  - Follow us on [Twitter](https://twitter.com/home_assistant), use @home_assistant
  - Join the [Google+ community](https://plus.google.com/u/0/b/110560654828510104551/communities/106562234893511202708)
 
diff --git a/source/help/trivia.markdown b/source/help/trivia.markdown
index 74d886db6cd..175b4269c58 100644
--- a/source/help/trivia.markdown
+++ b/source/help/trivia.markdown
@@ -33,7 +33,7 @@ This sections just contains some random numbers of the Home Assistant eco-system
 
 | Description | 2015 |
 |---|---|
-| [Gitter.io](https://gitter.im/balloob/home-assistant)  | 334 |
+| [Gitter.io](https://gitter.im/home-assistant/home-assistant)  | 334 |
 | [Forum posts](https://community.home-assistant.io/) | 352 |
 | [Forum topics](https://community.home-assistant.io/) | 83 |
 | [Forum members](https://community.home-assistant.io/) | 92 |