diff --git a/README b/README
index 0e3d562b3..bf917c21d 100644
--- a/README
+++ b/README
@@ -1,3 +1,5 @@
+-*- mode: org; fill-column:70 -*-
+
 This is a distribution of Org, a plain text notes and project planning
 tool for Emacs.
 
@@ -10,7 +12,7 @@ Check the [[https://orgmode.org][homepage of Org]] and the [[https://orgmode.org
 - COPYING :: The GNU General Public License.
 
 - Makefile :: The makefile to compile and install Org.  For
-  installation instructions, see the manual or [[https://orgmode.org/worg/dev/org-build-system.html][the more detailed
+  installation instructions, see [[https://orgmode.org/org.html#Installation][the manual]] or [[https://orgmode.org/worg/dev/org-build-system.html][this more detailed
   procedure on Worg]].
   
 - mk/ :: Files needed for building Org.
@@ -31,19 +33,32 @@ Check the [[https://orgmode.org][homepage of Org]] and the [[https://orgmode.org
 
 * Join the GNU Project
 
-Org is part of GNU Emacs.
-
-GNU Emacs is part of the GNU Operating System, developed by the GNU
-Project.  To learn more about Free (libre) Software, you can read this
-page: https://gnu.org/philosophy/free-sw.html
+Org is part of GNU Emacs and GNU Emacs is part of the GNU Operating
+System, developed by the GNU Project.
 
 If you are the author of an awesome program and want to join us in
 writing Free (libre) Software, please consider making it an official
-GNU program and become a GNU Maintainer.  You can find instructions 
-on how to do this here: http://www.gnu.org/help/evaluation
+GNU program and become a GNU Maintainer.  Instructions on how to do
+this are here: http://www.gnu.org/help/evaluation
+
+To learn more on how you can participate in the GNU Project, please
+refer to https://www.gnu.org/help/help.html and to learn more about
+Free (libre) Software, read https://gnu.org/philosophy/free-sw.html
 
 * License
 
 Org-mode is published under [[https://www.gnu.org/licenses/gpl-3.0.html][the GNU GPLv3 license]] or any later
-version, the same as GNU Emacs.  See the COPYING file in this
-directory.
+version, the same as GNU Emacs.
+
+Org-mode is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Org mode.  If not, see <https://www.gnu.org/licenses/>.