diff --git a/MANIFEST.in b/MANIFEST.in
index f09e9c0ef..54bb613f3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -14,6 +14,7 @@ include qutebrowser/git-commit-id
 include LICENSE doc/* README.asciidoc
 include misc/qutebrowser.desktop
 include misc/qutebrowser.appdata.xml
+include misc/Makefile
 include requirements.txt
 include tox.ini
 include qutebrowser.py
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index eec7ae6a7..61b2df17d 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -21,6 +21,9 @@ v1.1.0 (unreleased)
 Added
 ~~~~~
 
+- There's now a `misc/Makefile` file in releases, which should help
+  distributions which package qutebrowser, as they can run something like
+  `make -f misc/Makefile DESTDIR="$pkgdir" install` now.
 - New `{current_url}` field for `window.title_format` and `tabs.title.format`.
 - New `colors.statusbar.passthrough.fg`/`.bg` settings.
 - New `completion.delay` and `completion.min_chars` settings to update the
diff --git a/misc/Makefile b/misc/Makefile
new file mode 100644
index 000000000..fe97eb6bf
--- /dev/null
+++ b/misc/Makefile
@@ -0,0 +1,25 @@
+PYTHON = python3
+DESTDIR = /
+ICONSIZES = 16 24 32 48 64 128 256 512
+
+.PHONY: install
+
+doc/qutebrowser.1.html:
+	a2x -f manpage doc/qutebrowser.1.asciidoc
+
+install: doc/qutebrowser.1.html
+	$(PYTHON) setup.py install --root="$(DESTDIR)" --optimize=1
+	install -Dm644 doc/qutebrowser.1 \
+		"$(DESTDIR)/usr/share/man/man1/qutebrowser.1"
+	install -Dm644 misc/qutebrowser.desktop \
+		"$(DESTDIR)/usr/share/applications/qutebrowser.desktop"
+	$(foreach i,$(ICONSIZES),install -Dm644 "icons/qutebrowser-$(i)x$(i).png" \
+			"$(DESTDIR)/usr/share/icons/hicolor/$(i)x$(i)/apps/qutebrowser.png";)
+	install -Dm644 icons/qutebrowser.svg \
+		"$(DESTDIR)/usr/share/icons/hicolor/scalable/apps/qutebrowser.svg"
+	install -Dm755 -t "$(DESTDIR)/usr/share/qutebrowser/userscripts/" \
+		$(wildcard misc/userscripts/*)
+	install -Dm755 -t "$(DESTDIR)/usr/share/qutebrowser/scripts/" \
+		$(filter-out scripts/__init__.py scripts/__pycache__ scripts/dev \
+		  scripts/testbrowser_cpp scripts/asciidoc2html.py scripts/setupcommon.py \
+			scripts/link_pyqt.py,$(wildcard scripts/*))