diff --git a/META.json b/META.json
index 2691a9f..60fd42d 100644
--- a/META.json
+++ b/META.json
@@ -25,7 +25,7 @@
       }
    },
    "resources": {
-      "homepage": "https://github.com/reorg/pg_repack",
+      "homepage": "http://reorg.github.com/pg_repack",
       "bugtracker": {
          "web": "https://github.com/reorg/pg_reorg/issues"
       }
diff --git a/README.rst b/README.rst
index 09c014b..35b2953 100644
--- a/README.rst
+++ b/README.rst
@@ -1,9 +1,12 @@
 pg_repack -- Reorganize tables in PostgreSQL databases without any locks
 ========================================================================
 
-- Homepage: https://github.com/reorg/pg_repack
+- Homepage: http://reorg.github.com/pg_repack
+- Development: https://github.com/reorg/pg_repack
+- Bug Report: https://github.com/reorg/pg_reorg/issues
+- Mailing List: http://pgfoundry.org/mailman/listinfo/reorg-general
 
-pg_repack is an utility program to reorganize tables in PostgreSQL databases.
+pg_repack_ is an utility program to reorganize tables in PostgreSQL databases.
 Unlike clusterdb_, it doesn't block any selections and updates during
 reorganization.
 
@@ -11,8 +14,11 @@ pg_repack is a fork of the previous pg_reorg_ project. It was founded to
 gather the bug fixes and new development ideas that the slow pace of
 development of pg_reorg was struggling to satisfy.
 
+.. _pg_repack: http://reorg.github.com/pg_repack
 .. _clusterdb: http://www.postgresql.org/docs/current/static/app-clusterdb.html
 .. _pg_reorg: http://reorg.projects.pgfoundry.org/
 
-Please check the documentation (in the ``doc`` directory) for installation and
-usage instructions.
+Please check the documentation (in the ``doc`` directory or online_) for
+installation and usage instructions.
+
+.. _online: pg_repack_
diff --git a/doc/pg_repack.rst b/doc/pg_repack.rst
index 9a50019..a9670d7 100644
--- a/doc/pg_repack.rst
+++ b/doc/pg_repack.rst
@@ -41,13 +41,14 @@ Generic options:
 Description
 -----------
 
-pg_repack is an utility program to reorganize tables in PostgreSQL databases.
+pg_repack_ is an utility program to reorganize tables in PostgreSQL databases.
 Unlike clusterdb_, it doesn't block any selections and updates during
 reorganization.
 
 pg_repack is a fork of the previous pg_reorg_ project. It was founded to
 gather the bug fixes and new development ideas that the slow pace of
-development of pg_reorg was struggling to satisfy.
+development of pg_reorg was struggling to satisfy. Please check the `project
+page`_ for bug report and development information.
 
 You can choose one of the following methods to reorganize:
 
@@ -60,6 +61,8 @@ NOTICE:
 * Only superusers can use the utility.
 * Target table must have PRIMARY KEY.
 
+.. _pg_repack: http://reorg.github.com/pg_repack
+.. _project page: https://github.com/reorg/pg_repack
 .. _clusterdb: http://www.postgresql.org/docs/current/static/app-clusterdb.html
 .. _pg_reorg: http://reorg.projects.pgfoundry.org/
 
@@ -350,6 +353,6 @@ Releases
 See Also
 --------
 
-    * `clusterdb <http://www.postgresql.org/docs/current/static/app-clusterdb.html>`__
-    * `vacuumdb <http://www.postgresql.org/docs/current/static/app-vacuumdb.html>`__
+* `clusterdb <http://www.postgresql.org/docs/current/static/app-clusterdb.html>`__
+* `vacuumdb <http://www.postgresql.org/docs/current/static/app-vacuumdb.html>`__