5 files changed, 8 insertions, 8 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2cb202b201..3eaa046175 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -181,7 +181,7 @@ such as [`tig`][tig].
 [github-pr-1820]: https://github.com/neovim/neovim/pull/1820
 [hub]: https://hub.github.com/
 [imperative]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
-[style-guide]: http://neovim.org/develop/style-guide.xml
+[style-guide]: http://neovim.io/develop/style-guide.xml
 [tig]: https://github.com/jonas/tig
 [valgrind]: http://valgrind.org/
 [vcs]: https://en.wikipedia.org/wiki/Revision_control
diff --git a/README.md b/README.md
index 3f2b1581cf..e613928302 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 ![Neovim](https://raw.githubusercontent.com/neovim/neovim.github.io/master/logos/neovim-logo.png)
 
-[Website](http://neovim.org) |
-[Community](http://neovim.org/community/) |
+[Website](http://neovim.io) |
+[Community](http://neovim.io/community/) |
 [Wiki](https://github.com/neovim/neovim/wiki) |
-[Documentation](http://neovim.org/doc) |
+[Documentation](http://neovim.io/doc) |
 [Mailing List](https://groups.google.com/forum/#!forum/neovim) |
 [Twitter](http://twitter.com/Neovim) |
 [Bountysource](https://www.bountysource.com/teams/neovim)
@@ -12,7 +12,7 @@
 [![Pull requests waiting for review](https://badge.waffle.io/neovim/neovim.svg?label=RFC&title=RFCs)](https://waffle.io/neovim/neovim)
 [![Coverage Status](https://img.shields.io/coveralls/neovim/neovim.svg)](https://coveralls.io/r/neovim/neovim)
 [![Coverity Scan Build](https://scan.coverity.com/projects/2227/badge.svg)](https://scan.coverity.com/projects/2227)
-[![Clang Scan Build](http://neovim.org/doc/reports/clang/badge.svg)](http://neovim.org/doc/reports/clang)
+[![Clang Scan Build](http://neovim.io/doc/reports/clang/badge.svg)](http://neovim.io/doc/reports/clang)
 [![Join the chat at https://gitter.im/neovim/neovim](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/neovim/neovim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Neovim is a project that seeks to aggressively refactor Vim in order to:
diff --git a/clint.py b/clint.py
index efce5b3753..ccf1c11c3d 100755
--- a/clint.py
+++ b/clint.py
@@ -65,7 +65,7 @@ Syntax: clint.py [--verbose=#] [--output=vs7] [--filter=-x,+y,...]
         <file> [file] ...
 
   The style guidelines this tries to follow are those in
-    http://neovim.org/development-wiki/style-guide/style-guide.xml
+    http://neovim.io/development-wiki/style-guide/style-guide.xml
 
   Note: This is Google's cpplint.py modified for use with the Neovim project,
   which follows the Google C++ coding convention except with the following
diff --git a/contrib/doxygen/extra.css b/contrib/doxygen/extra.css
index feb6d2d237..59e0c25848 100644
--- a/contrib/doxygen/extra.css
+++ b/contrib/doxygen/extra.css
@@ -422,7 +422,7 @@ th {
   padding: 0;
 }
 
-/* neovim.org/css/main.css */
+/* neovim.io/css/main.css */
 
 * {
   -moz-box-sizing: border-box;
diff --git a/contrib/doxygen/header.html b/contrib/doxygen/header.html
index e1afe71aee..c9c1509d86 100644
--- a/contrib/doxygen/header.html
+++ b/contrib/doxygen/header.html
@@ -24,7 +24,7 @@ $extrastylesheet
   <div class="container">
     <nav class="site-nav">
       <ul>
-        <li><a href="http://neovim.org/">Neovim Home</a></li>
+        <li><a href="http://neovim.io/">Neovim Home</a></li>
       </ul>
     </nav>
     <a href="$relpath^index.html">