diff --git a/examples/riotjs/readme.md b/examples/riotjs/readme.md
index d822499da9..7e6aad0cdd 100644
--- a/examples/riotjs/readme.md
+++ b/examples/riotjs/readme.md
@@ -4,18 +4,18 @@
 
 > Riot is against the current trend of boilerplate and unneeded complexity. The team think that a small, powerful API and concise syntax are extremely important things on a client-side library.
 
-> _[Riot.js - riotjs.com](http://riotjs.com/)_
+> _[Riot.js - riot.js.org](http://riot.js.org/)_
 
 
 ## Resources
 
-- [Website](http://riotjs.com/)
-- [Documentation](http://riotjs.com/guide/)
-- [FAQ](http://riotjs.com/faq/)
+- [Website](http://riot.js.org/)
+- [Documentation](http://riot.js.org/documentation/)
+- [FAQ](http://riot.js.org/faq/)
 
 ### Articles
 
-- [Compare Riot with React and Polymer](http://riotjs.com/compare/)
+- [Compare Riot with React and Polymer](http://v3.riotjs.vercel.app/compare/)
 - [The react tutorial for riot](https://juriansluiman.nl/article/154/the-react-tutorial-for-riot)
 
 ### Support
diff --git a/index.html b/index.html
index 9bff343ea4..2adfb1f7dc 100644
--- a/index.html
+++ b/index.html
@@ -222,7 +222,7 @@ <h2>Examples</h2>
 									<a href="examples/angular2/" data-source="http://angular.io" data-content="Angular is a development platform for building mobile and desktop web applications">Angular 2.0</a>
 								</li>
 								<li class="routing">
-									<a href="examples/riotjs/" data-source="http://riotjs.com/" data-content="Riot.js is a React-like user interface micro-library.">Riot</a>
+									<a href="examples/riotjs/" data-source="http://riot.js.org/" data-content="Riot.js is a React-like user interface micro-library.">Riot</a>
 								</li>
 								<li class="routing">
 									<a href="examples/jsblocks/" data-source="http://jsblocks.com/" data-content="From simple user interfaces to complex single-page applications using faster, server-side rendered and easy to learn framework.">JSBlocks</a>
diff --git a/learn.json b/learn.json
index aa64509afe..c3d40e5659 100644
--- a/learn.json
+++ b/learn.json
@@ -1563,7 +1563,7 @@
 	"riotjs": {
 		"name": "Riot.js",
 		"description": "Riot.js is a React-like user interface micro-library.",
-		"homepage": "riotjs.com",
+		"homepage": "riot.js.org",
 		"examples": [{
 			"name": "Example",
 			"url": "examples/riotjs"
@@ -1572,10 +1572,10 @@
 			"heading": "Official Resources",
 			"links": [{
 				"name": "Documentation",
-				"url": "http://riotjs.com/guide/"
+				"url": "http://riot.js.org/documentation/"
 			}, {
 				"name": "API Reference",
-				"url": "http://riotjs.com/api/"
+				"url": "http://riot.js.org/api/"
 			}, {
 				"name": "Examples",
 				"url": "https://github.com/riot/riot#demos"