diff --git a/Makefile b/Makefile
index c3a78b9..e16de99 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ browser:
 	echo '/*'                                                                          >> $(BROWSER_FILE_DEV)
 	echo " * PEG.js $(PEGJS_VERSION)"                                                  >> $(BROWSER_FILE_DEV)
 	echo ' *'                                                                          >> $(BROWSER_FILE_DEV)
-	echo ' * http://pegjs.majda.cz/'                                                   >> $(BROWSER_FILE_DEV)
+	echo ' * http://pegjs.org/'                                                        >> $(BROWSER_FILE_DEV)
 	echo ' *'                                                                          >> $(BROWSER_FILE_DEV)
 	echo ' * Copyright (c) 2010-2013 David Majda'                                      >> $(BROWSER_FILE_DEV)
 	echo ' * Licensed under the MIT license.'                                          >> $(BROWSER_FILE_DEV)
diff --git a/README.md b/README.md
index 19acb9e..0829b57 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,13 @@ Features
   * Based on [parsing expression
     grammar](http://en.wikipedia.org/wiki/Parsing_expression_grammar) formalism
     — more powerful than traditional LL(*k*) and LR(*k*) parsers
-  * Usable [from your browser](http://pegjs.majda.cz/online), from the command
-    line, or via JavaScript API
+  * Usable [from your browser](http://pegjs.org/online), from the command line,
+    or via JavaScript API
 
 Getting Started
 ---------------
 
-[Online version](http://pegjs.majda.cz/online) is the easiest way to generate a
+[Online version](http://pegjs.org/online) is the easiest way to generate a
 parser. Just enter your grammar, try parsing few inputs, and download generated
 parser code.
 
@@ -43,8 +43,8 @@ ways.
 
 ### Browser
 
-[Download](http://pegjs.majda.cz/#download) the PEG.js library (regular or
-minified version) or install it using Bower:
+[Download](http://pegjs.org/#download) the PEG.js library (regular or minified
+version) or install it using Bower:
 
     $ bower install pegjs
 
@@ -428,7 +428,7 @@ environments:
 Development
 -----------
 
-  * [Project website](http://pegjs.majda.cz/)
+  * [Project website](http://pegjs.org/)
   * [Wiki](https://github.com/pegjs/pegjs/wiki)
   * [Source code](https://github.com/pegjs/pegjs)
   * [Trello board](https://trello.com/board/peg-js/50a8eba48cf95d4957006b01)
diff --git a/lib/compiler/passes/generate-javascript.js b/lib/compiler/passes/generate-javascript.js
index 61a5bce..6e69aab 100644
--- a/lib/compiler/passes/generate-javascript.js
+++ b/lib/compiler/passes/generate-javascript.js
@@ -682,7 +682,7 @@ function generateJavascript(ast, options) {
     '  /*',
     '   * Generated by PEG.js 0.8.0.',
     '   *',
-    '   * http://pegjs.majda.cz/',
+    '   * http://pegjs.org/',
     '   */',
     '',
     '  function peg$subclass(child, parent) {',
diff --git a/lib/parser.js b/lib/parser.js
index d9c1789..b490578 100644
--- a/lib/parser.js
+++ b/lib/parser.js
@@ -2,7 +2,7 @@ module.exports = (function() {
   /*
    * Generated by PEG.js 0.8.0.
    *
-   * http://pegjs.majda.cz/
+   * http://pegjs.org/
    */
 
   function peg$subclass(child, parent) {
diff --git a/package.json b/package.json
index b2b7a0e..517fd31 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name":            "pegjs",
   "version":         "0.8.0",
   "description":     "Parser generator for JavaScript",
-  "homepage":        "http://pegjs.majda.cz/",
+  "homepage":        "http://pegjs.org/",
   "author":          {
     "name":  "David Majda",
     "email": "david@majda.cz",