diff --git a/composer.json b/composer.json
index 2cd1eded..82b83b2b 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "twig/extensions",
     "description": "Common additional features for Twig that do not directly belong in core",
     "keywords": ["i18n","text"],
-    "homepage": "https://github.com/fabpot/Twig-extensions",
+    "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
     "type": "library",
     "license": "MIT",
     "authors": [
diff --git a/doc/index.rst b/doc/index.rst
index fc8902db..850488ae 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -11,7 +11,7 @@ Twig Extensions
     date
 
 The Twig Extensions is a library that provides several useful extensions
-for Twig. You can find it's code at `GitHub.com/fabpot/Twig-extensions`_.
+for Twig. You can find it's code at `GitHub.com/twigphp/Twig-extensions`_.
 
 .. _extensions-install:
 
@@ -36,4 +36,4 @@ command line:
 
 * :doc:`Date <date>`: Adds a filter for rendering the difference between dates.
 
-.. _`GitHub.com/fabpot/Twig-extensions`: https://github.com/fabpot/Twig-extensions
+.. _`GitHub.com/twigphp/Twig-extensions`: https://github.com/twigphp/Twig-extensions