diff --git a/Makefile b/Makefile
index ff3210618..47f94c3d4 100644
--- a/Makefile
+++ b/Makefile
@@ -32,3 +32,9 @@ rendered_logo: logo/kitty.iconset/icon_256x256.png
 
 app: rendered_logo
 	python3 setup.py kitty.app $(VVAL)
+
+man:
+	$(MAKE) -C docs man
+
+html:
+	$(MAKE) -C docs html
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1179c7c70..c213dc4a3 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -78,6 +78,8 @@ Changelog
 - :doc:`hints kitten <kittens/hints>`: Fix a regression that caused some blank lines to be not
   be displayed.
 
+- Linux: Include a man page and the HTML docs when building the linux-package
+
 
 0.10.1 [2018-05-24]
 ------------------------------
diff --git a/setup.py b/setup.py
index c0ef65ab6..83867d052 100755
--- a/setup.py
+++ b/setup.py
@@ -533,7 +533,42 @@ def build_linux_launcher(args, launcher_dir='.', for_bundle=False, sh_launcher=F
     run_tool(cmd)
 
 
-def package(args, for_bundle=False, sh_launcher=False):  # {{{
+# Packaging {{{
+
+
+def copy_man_pages(ddir):
+    mandir = os.path.join(ddir, 'share', 'man')
+    safe_makedirs(mandir)
+    try:
+        shutil.rmtree(os.path.join(mandir, 'man1'))
+    except FileNotFoundError:
+        pass
+    src = 'docs/_build/man'
+    if not os.path.exists(src):
+        raise SystemExit('''\
+The kitty man page is missing. If you are building from git then run: make docs
+(needs the sphinx documentation system to be installed)
+''')
+    shutil.copytree(src, os.path.join(mandir, 'man1'))
+
+
+def copy_html_docs(ddir):
+    htmldir = os.path.join(ddir, 'share', 'doc', appname, 'html')
+    safe_makedirs(os.path.dirname(htmldir))
+    try:
+        shutil.rmtree(htmldir)
+    except FileNotFoundError:
+        pass
+    src = 'docs/_build/html'
+    if not os.path.exists(src):
+        raise SystemExit('''\
+The kitty html docs are missing. If you are building from git then run: make html
+(needs the sphinx documentation system to be installed)
+''')
+    shutil.copytree(src, htmldir)
+
+
+def package(args, for_bundle=False, sh_launcher=False):
     ddir = args.prefix
     if for_bundle or sh_launcher:
         args.libdir_name = 'lib'
@@ -568,6 +603,8 @@ def package(args, for_bundle=False, sh_launcher=False):  # {{{
     safe_makedirs(launcher_dir)
     build_linux_launcher(args, launcher_dir, for_bundle, sh_launcher, args.for_freeze)
     if not is_macos:  # {{{ linux desktop gunk
+        copy_man_pages(ddir)
+        copy_html_docs(ddir)
         icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', '256x256', 'apps')
         safe_makedirs(icdir)
         shutil.copy2('logo/kitty.png', icdir)
@@ -581,7 +618,7 @@ Version=1.0
 Type=Application
 Name=kitty
 GenericName=Terminal emulator
-Comment=A modern, hackable, featureful, OpenGL based terminal emulator
+Comment=A fast, feature full, GPU based terminal emulator
 TryExec=kitty
 Exec=kitty
 Icon=kitty