diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md
index 5c17048e9..0ec7afd53 100644
--- a/doc/01-basic-usage.md
+++ b/doc/01-basic-usage.md
@@ -136,8 +136,8 @@ packagist.
 
 ## Autoloading
 
-For libraries that follow the [PSR-0](https://github.com/php-fig/fig-
-standards/blob/master/accepted/PSR-0.md) naming standard, composer generates a
+For libraries that follow the [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md)
+naming standard, composer generates a
 `vendor/.composer/autoload.php` file for autoloading. You can simply include
 this file and you will get autoloading for free.
 
diff --git a/doc/04-schema.md b/doc/04-schema.md
index 2e1c3d2f6..909041bdd 100644
--- a/doc/04-schema.md
+++ b/doc/04-schema.md
@@ -6,9 +6,8 @@ This chapter will explain all of the options available in `composer.json`.
 
 We have a [JSON schema](http://json-schema.org) that documents the format and
 can also be used to validate your `composer.json`. In fact, it is used by the
-`validate` command. You can find it at: [`Resources/composer-
-schema.json`](https://github.com/composer/composer/blob/master/res
-/composer-schema.json).
+`validate` command. You can find it at: 
+[`Resources/composer-schema.json`](https://github.com/composer/composer/blob/master/res/composer-schema.json).
 
 ## Package root
 
@@ -188,8 +187,8 @@ Optional.
 
 Autoload mapping for a PHP autoloader.
 
-Currently only [PSR-0](https://github.com/php-fig/fig-
-standards/blob/master/accepted/PSR-0.md) autoloading is supported. Under the
+Currently only [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md)
+autoloading is supported. Under the
 `psr-0` key you define a mapping from namespaces to paths, relative to the
 package root.
 
diff --git a/doc/06-community.md b/doc/06-community.md
index 35a92092a..cdf394295 100644
--- a/doc/06-community.md
+++ b/doc/06-community.md
@@ -22,7 +22,7 @@ The most important guidelines are described as follows:
 
 ## IRC / mailing list
 
-The developer mailing list is on [google groups](http://groups.google.com/group
-/composer-dev) IRC channels are available for discussion as well, on
+The developer mailing list is on [google groups](http://groups.google.com/group/composer-dev/) 
+IRC channels are available for discussion as well, on
 irc.freenode.org [#composer](irc://irc.freenode.org/composer) for users and
 [#composer-dev](irc://irc.freenode.org/composer-dev) for development.