diff --git a/AUTHORS b/AUTHORS
index 7d33693..dbb661e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,6 +38,7 @@
 Sanjoy Das <sanjoy@playingwithpointers.com>
 Shenghou Ma <minux@golang.org> <minux.ma@gmail.com>
 Svante Signell <svante.signell@gmail.com>
+Thiago Avelino <avelinorun@gmail.com>
 Tobias Klauser <tklauser@distanz.ch>
 Uros Bizjak <ubizjak@gmail.com>
 Vinu Rajashekhar <vinutheraj@gmail.com>
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 161c18c..9f40d5f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -71,6 +71,7 @@
 Svante Signell <svante.signell@gmail.com>
 Tim Shen <timshen@google.com>
 Than McIntosh <thanm@google.com>
+Thiago Avelino <avelinorun@gmail.com>
 Tobias Klauser <tklauser@distanz.ch>
 Tony Reix <tony.reix@bull.net>
 Uros Bizjak <ubizjak@gmail.com>
diff --git a/README b/README
deleted file mode 100644
index 07a09ce..0000000
--- a/README
+++ /dev/null
@@ -1,53 +0,0 @@
-A Go frontend
-=============
-
-Ian Lance Taylor
-iant@golang.org
-Last update 15 June 2014
-
-This is a compiler frontend for the Go programming language
-(http://golang.org/).  The frontend was originally developed at
-Google, and was released in November 2009.  It was originally written
-by Ian Lance Taylor <iant@golang.org>.
-
-It was originally written for GCC (http://gcc.gnu.org/).  As of this
-writing it only supports GCC, but the GCC support has been separated
-from the rest of the frontend, so supporting another compiler is
-feasible.
-
-The go subdirectory holds the frontend source code.  This is mirrored
-to the gcc/go subdirectory in the GCC repository.
-
-The libgo subdirectory holds the library source code.  This is a copy
-of the main Go library with various changes appropriate for this
-compiler.  The main Go library is hosted at
-http://go.googlesource.com/go, in the src directory.  The libgo
-subdirectory is mirrored to the libgo subdirectory in the gcc
-repository.
-
-
-Legal Matters
-=============
-
-To contribute patches to the files in this directory, please see
-http://golang.org/doc/gccgo_contribute.html .
-
-The master copy of these files is hosted at
-http://go.googlesource.com/gofrontend (there is a mirror at
-http://github.com/golang/gofrontend).  Changes to these files require
-signing a Google contributor license agreement.  If you are the
-copyright holder, you will need to agree to the individual contributor
-license agreement at
-http://code.google.com/legal/individual-cla-v1.0.html.  This agreement
-can be completed online.
-
-If your organization is the copyright holder, the organization will
-need to agree to the corporate contributor license agreement at
-http://code.google.com/legal/corporate-cla-v1.0.html.
-
-If the copyright holder for your code has already completed the
-agreement in connection with another Google open source project, it
-does not need to be completed again.
-
-The authors of these files may be found in the AUTHORS and
-CONTRIBUTORS files.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c2eae02
--- /dev/null
+++ b/README.md
@@ -0,0 +1,24 @@
+# A Go frontend
+
+Ian Lance Taylor
+Last update 15 June 2014
+
+This is a compiler frontend for the [Go programming language](http://golang.org/). The frontend was originally developed at Google, and was released in November 2009. It was originally written by Ian Lance Taylor.
+
+It was originally written for [GCC](http://gcc.gnu.org/). As of this writing it only supports GCC, but the GCC support has been separated from the rest of the frontend, so supporting another compiler is feasible.
+
+The go subdirectory holds the frontend source code. This is mirrored to the gcc/go subdirectory in the GCC repository.
+
+The libgo subdirectory holds the library source code. This is a copy of the main Go library with various changes appropriate for this compiler. The main Go library is hosted at <http://go.googlesource.com/go>, in the src directory. The libgo subdirectory is mirrored to the libgo subdirectory in the gcc repository.
+
+## Legal Matters
+
+To contribute patches to the files in this directory, please see [Contributing to the gccgo frontend](http://golang.org/doc/gccgo_contribute.html).
+
+The master copy of these files is hosted in [Gerrit](http://go.googlesource.com/gofrontend) (there is a mirror at [Github](http://github.com/golang/gofrontend)). Changes to these files require signing a Google contributor license agreement. If you are the copyright holder, you will need to agree to the [Google Individual Contributor License Agreement](http://code.google.com/legal/individual-cla-v1.0.html). This agreement can be completed online.
+
+If your organization is the copyright holder, the organization will need to agree to the [Google Software Grant and Corporate Contributor License Agreement](http://code.google.com/legal/corporate-cla-v1.0.html).
+
+If the copyright holder for your code has already completed the agreement in connection with another Google open source project, it does not need to be completed again.
+
+The authors of these files may be found in the [AUTHORS](./AUTHORS) and [CONTRIBUTORS](./CONTRIBUTORS) files.