diff --git a/Makefile b/Makefile
index 4c9a795..2b33e2e 100644
--- a/Makefile
+++ b/Makefile
@@ -167,8 +167,10 @@ install-rh: install-systemd install-systemd-dropins install-sysvinit
 		$(DESTDIR)$(PYTHON3_SITELIB)/dnf-plugins/qubes-hooks.py
 	install -D -m 0644 misc/dnf-qubes-hooks.conf $(DESTDIR)/etc/dnf/plugins/qubes-hooks.conf
 
+install-doc:
+	$(MAKE) -C doc install
 
-install-common:
+install-common: install-doc
 	$(MAKE) -C autostart-dropins install
 	install -m 0644 -D misc/fstab $(DESTDIR)/etc/fstab
 
diff --git a/debian/control b/debian/control
index d046850..56d7a12 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Build-Depends:
     dh-python,
     lsb-release,
     xserver-xorg-dev,
-    config-package-dev
+    config-package-dev,
+    pandoc,
 Standards-Version: 3.9.5
 Homepage: https://www.qubes-os.org
 Vcs-Git: https://github.com/QubesOS/qubes-core-agent-linux
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index d0118c7..1be477f 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -121,5 +121,6 @@ usr/lib/systemd/user/pulseaudio.service.d/30_qubes.conf
 usr/lib/systemd/user/pulseaudio.socket.d/30_qubes.conf
 usr/share/glib-2.0/schemas/*
 usr/share/kde4/services/*.desktop
+usr/share/man/man1/qvm-*
 usr/share/qubes/mime-override/globs
 usr/share/qubes/qubes-master-key.asc
diff --git a/rpm_spec/core-agent.spec b/rpm_spec/core-agent.spec
index 8261183..6699930 100644
--- a/rpm_spec/core-agent.spec
+++ b/rpm_spec/core-agent.spec
@@ -298,8 +298,6 @@ usermod -p '' root
 (cd qrexec; make install DESTDIR=$RPM_BUILD_ROOT)
 make install-vm DESTDIR=$RPM_BUILD_ROOT
 
-make -C doc install DESTDIR=$RPM_BUILD_ROOT
-
 %if %{fedora} >= 22
 rm -f $RPM_BUILD_ROOT/etc/yum/post-actions/qubes-trigger-sync-appmenus.action
 %endif