diff --git a/data/etc/plinth/plinth.config b/data/etc/plinth/plinth.config
index 4b0ca66ea..f1bd618fe 100644
--- a/data/etc/plinth/plinth.config
+++ b/data/etc/plinth/plinth.config
@@ -5,7 +5,7 @@ config_dir = /etc/plinth
 data_dir = /var/lib/plinth
 server_dir = /plinth
 actions_dir = /usr/share/plinth/actions
-doc_dir = /usr/share/doc/freedombox
+doc_dir = /usr/share/freedombox
 custom_static_dir = /var/www/plinth/custom/static
 
 # file locations
diff --git a/debian/control b/debian/control
index ed25e7a03..64008133d 100644
--- a/debian/control
+++ b/debian/control
@@ -119,6 +119,9 @@ Recommends:
  dosfstools,
 # Priority: standard
  file,
+# FreedomBox documentation
+ freedombox-manual-en,
+ freedombox-manual-es,
 # Provide entropy using HAVEGE algorithm
  haveged,
 # Monitor system resources
@@ -176,3 +179,31 @@ Description: easy to manage, privacy oriented home server
  This package provides the FreedomBox Service (Plinth) which installs,
  configures and manages all functions of FreedomBox. The service is managed
  using a web interface available at https://localhost/.
+
+Package: freedombox-doc-en
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: easy to manage, privacy oriented home server - user manual (English)
+ FreedomBox is designed to be your own inexpensive server at home. It runs free
+ software and offers an increasing number of services ranging from a calendar or
+ jabber server to a wiki or VPN. A web interface allows you to easily install
+ and configure your apps.
+ .
+ This package contains the English user manual in HTML and PDF formats. It
+ describes how to setup and use each application in FreedomBox and FreedomBox
+ itself. It is accessible from Help menu in the FreedomBox web interface.
+
+Package: freedombox-doc-es
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Description: easy to manage, privacy oriented home server - user manual (Spanish)
+ FreedomBox is designed to be your own inexpensive server at home. It runs free
+ software and offers an increasing number of services ranging from a calendar or
+ jabber server to a wiki or VPN. A web interface allows you to easily install
+ and configure your apps.
+ .
+ This package contains the Spanish user manual in HTML and PDF formats. It
+ describes how to setup and use each application in FreedomBox and FreedomBox
+ itself. It is accessible from Help menu in the FreedomBox web interface.
diff --git a/debian/freedombox-doc-en.doc-base b/debian/freedombox-doc-en.doc-base
new file mode 100644
index 000000000..218f92413
--- /dev/null
+++ b/debian/freedombox-doc-en.doc-base
@@ -0,0 +1,15 @@
+Document: freedombox-doc-en
+Title: FreedomBox User Manual - English
+Author: FreedomBox Authors
+Abstract: easy to manage, privacy oriented home server - English user manual.
+ This user manual describes how to setup and use each application in FreedomBox
+ and FreedomBox itself. It is also accessible from Help menu in the FreedomBox
+ web interface.
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/freedombox/manual/en/freedombox-manual.part.html
+Files: /usr/share/doc/freedombox/manual/en/*.html
+
+Format: PDF
+Files: /usr/share/doc/freedombox/manual/en/freedombox-manual.pdf
diff --git a/debian/freedombox-doc-en.install b/debian/freedombox-doc-en.install
new file mode 100644
index 000000000..043084281
--- /dev/null
+++ b/debian/freedombox-doc-en.install
@@ -0,0 +1 @@
+usr/share/freedombox/manual/en/
diff --git a/debian/freedombox-doc-en.links b/debian/freedombox-doc-en.links
new file mode 100644
index 000000000..5c12ebb24
--- /dev/null
+++ b/debian/freedombox-doc-en.links
@@ -0,0 +1 @@
+usr/share/freedombox/manual/en usr/share/doc/freedombox/manual/en
diff --git a/debian/freedombox-doc-es.doc-base b/debian/freedombox-doc-es.doc-base
new file mode 100644
index 000000000..4167a01b0
--- /dev/null
+++ b/debian/freedombox-doc-es.doc-base
@@ -0,0 +1,15 @@
+Document: freedombox-doc-es
+Title: FreedomBox User Manual - Spanish
+Author: FreedomBox Authors
+Abstract: easy to manage, privacy oriented home server - Spanish user manual.
+ This user manual describes how to setup and use each application in FreedomBox
+ and FreedomBox itself. It is also accessible from Help menu in the FreedomBox
+ web interface.
+Section: Network/Communication
+
+Format: HTML
+Index: /usr/share/doc/freedombox/manual/es/freedombox-manual.part.html
+Files: /usr/share/doc/freedombox/manual/es/*.html
+
+Format: PDF
+Files: /usr/share/doc/freedombox/manual/es/freedombox-manual.pdf
diff --git a/debian/freedombox-doc-es.install b/debian/freedombox-doc-es.install
new file mode 100644
index 000000000..389d7ec4d
--- /dev/null
+++ b/debian/freedombox-doc-es.install
@@ -0,0 +1 @@
+usr/share/freedombox/manual/es/
diff --git a/debian/freedombox-doc-es.links b/debian/freedombox-doc-es.links
new file mode 100644
index 000000000..34006452d
--- /dev/null
+++ b/debian/freedombox-doc-es.links
@@ -0,0 +1 @@
+usr/share/freedombox/manual/es usr/share/doc/freedombox/manual/es
diff --git a/debian/freedombox.doc-base b/debian/freedombox.doc-base
deleted file mode 100644
index a5597570d..000000000
--- a/debian/freedombox.doc-base
+++ /dev/null
@@ -1,20 +0,0 @@
-Document: freedombox
-Title: FreedomBox Documentation
-Author: FreedomBox Authors
-Abstract: easy to manage, privacy oriented home server
- FreedomBox is designed to be your own inexpensive server at home. It runs free
- software and offers an increasing number of services ranging from a calendar or
- jabber server to a wiki or VPN. A web interface allows you to easily install
- and configure your apps.
- .
- This package provides the FreedomBox Service (Plinth) which installs,
- configures and manages all functions of FreedomBox. The service is managed
- using a web interface available at https://localhost/.
-Section: Network/Communication
-
-Format: HTML
-Index: /usr/share/doc/freedombox/manual/en/freedombox-manual.part.html
-Files: /usr/share/doc/freedombox/manual/en/*.html
-
-Format: PDF
-Files: /usr/share/doc/freedombox/manual/en/freedombox-manual.pdf
diff --git a/debian/freedombox.install b/debian/freedombox.install
new file mode 100644
index 000000000..d853deb19
--- /dev/null
+++ b/debian/freedombox.install
@@ -0,0 +1,11 @@
+etc
+lib
+usr/bin
+usr/lib
+usr/share/augeas
+usr/share/dbus-1
+usr/share/man
+usr/share/pam-configs
+usr/share/plinth
+usr/share/polkit-1
+var
diff --git a/debian/rules b/debian/rules
index aecb9872a..ac00ed40f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export DH_VERBOSE=1
-export PYBUILD_DESTDIR=debian/freedombox
+export PYBUILD_DESTDIR=debian/tmp
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
diff --git a/doc/Makefile b/doc/Makefile
index 722e9f14c..710f24d21 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -10,7 +10,7 @@ MANUAL_URL_RAW="https://wiki.debian.org/{lang-fragment}FreedomBox/Manual?action=
 MANUAL_PAGE_URL="https://wiki.debian.org/{lang-fragment}FreedomBox/Manual/{page}?action=show&mimetype=text%2Fdocbook"
 
 DESTDIR=
-INSTALL_DIR=$(DESTDIR)/usr/share/doc/freedombox
+INSTALL_DIR=$(DESTDIR)/usr/share/freedombox
 SCRIPTS_DIR=scripts
 
 manual-pdfs=$(foreach lang,$(MANUAL_LANGUAGES),manual/$(lang)/freedombox-manual.pdf)