diff --git a/.github/CONTRIBUTING.asciidoc b/.github/CONTRIBUTING.asciidoc
index 5ea2f758b..6c64f296a 100644
--- a/.github/CONTRIBUTING.asciidoc
+++ b/.github/CONTRIBUTING.asciidoc
@@ -1 +1,9 @@
+- Before you start to work on something, please leave a comment on the relevant
+  issue (or open one). This makes sure there is no duplicate work done.
+
+- Either run the testsuite locally, or keep an eye on Travis CI / AppVeyor
+  after pushing changes.
+
+See the full contribution docs for details:
+
 include::../doc/contributing.asciidoc[]
diff --git a/.github/LICENSE b/.github/LICENSE
deleted file mode 120000
index 4d11998dc..000000000
--- a/.github/LICENSE
+++ /dev/null
@@ -1 +0,0 @@
-../doc/COPYING
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index fd694e9e4..429c01961 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,11 +15,8 @@ __pycache__
 /qutebrowser/3rdparty
 /doc/*.html
 /README.html
-/CHANGELOG.html
-/CONTRIBUTING.html
-/FAQ.html
-/INSTALL.html
 /qutebrowser/html/doc/
+/qutebrowser/html/*.html
 /.venv*
 /.coverage
 /htmlcov
diff --git a/doc/COPYING b/LICENSE
similarity index 100%
rename from doc/COPYING
rename to LICENSE
diff --git a/README.asciidoc b/README.asciidoc
index 1bb2feba8..7a1af16e9 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -9,7 +9,7 @@ qutebrowser
 // QUTE_WEB_HIDE
 image:icons/qutebrowser-64x64.png[qutebrowser logo] *A keyboard-driven, vim-like browser based on PyQt5 and Qt.*
 
-image:https://img.shields.io/pypi/l/qutebrowser.svg?style=flat["license badge",link="https://github.com/qutebrowser/qutebrowser/blob/master/doc/COPYING"]
+image:https://img.shields.io/pypi/l/qutebrowser.svg?style=flat["license badge",link="https://github.com/qutebrowser/qutebrowser/blob/master/LICENSE"]
 image:https://img.shields.io/pypi/v/qutebrowser.svg?style=flat["version badge",link="https://pypi.python.org/pypi/qutebrowser/"]
 image:https://requires.io/github/qutebrowser/qutebrowser/requirements.svg?branch=master["requirements badge",link="https://requires.io/github/qutebrowser/qutebrowser/requirements/?branch=master"]
 image:https://travis-ci.org/qutebrowser/qutebrowser.svg?branch=master["Build Status", link="https://travis-ci.org/qutebrowser/qutebrowser"]
diff --git a/misc/qutebrowser.nsi b/misc/qutebrowser.nsi
index bc0b90b1b..8da9834b3 100644
--- a/misc/qutebrowser.nsi
+++ b/misc/qutebrowser.nsi
@@ -23,7 +23,7 @@ SetCompressor /solid lzma
 !define MUI_ICON "../icons/qutebrowser.ico"
 !define MUI_UNICON "../icons/qutebrowser.ico"
 
-!insertmacro MUI_PAGE_LICENSE "..\doc\COPYING"
+!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
 !insertmacro MUI_UNPAGE_CONFIRM
diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py
index 72a9fe457..478769a85 100644
--- a/qutebrowser/browser/qutescheme.py
+++ b/qutebrowser/browser/qutescheme.py
@@ -345,7 +345,7 @@ def qute_log(url):
 @add_handler('gpl')
 def qute_gpl(_url):
     """Handler for qute://gpl. Return HTML content as string."""
-    return 'text/html', utils.read_file('html/COPYING.html')
+    return 'text/html', utils.read_file('html/LICENSE.html')
 
 
 @add_handler('help')
diff --git a/scripts/dev/Makefile-dmg b/scripts/dev/Makefile-dmg
index e4711a038..1cf4cfb04 100644
--- a/scripts/dev/Makefile-dmg
+++ b/scripts/dev/Makefile-dmg
@@ -21,7 +21,7 @@
 NAME ?= qutebrowser
 
 SOURCE_DIR ?= .
-SOURCE_FILES ?= dist/qutebrowser.app doc/COPYING
+SOURCE_FILES ?= dist/qutebrowser.app LICENSE
 
 TEMPLATE_DMG ?= template.dmg
 TEMPLATE_SIZE ?= 300m