diff --git a/Makefile.PL b/Makefile.PL
index 0a0d4b7a0e..f6b2f22efd 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -96,7 +96,7 @@ Makefile.PL - Koha packager and installer
     --install_sru                Install the SRU server (yes, no)
     --install_pazpar2            Install PazPar2 (yes, no)
     --use_memcached              Use Memcached (yes, no)
-    --font_dir                   Location of fonts (e.g. /usr/share/fonts/truetype/ttf-dejavu)
+    --font_dir                   Location of fonts (e.g. /usr/share/fonts/truetype/dejavu)
     --run_database_tests         Run database dependent tests (yes, no)
     --install_base               Base directory of installation (e.g. /usr/share/koha)
     --template-cache-dir         Specify a template cache directory (e.g. /var/cache/koha)
@@ -488,7 +488,7 @@ my %config_defaults = (
   'MEMCACHED_SERVERS' => '127.0.0.1:11211',
   'MEMCACHED_NAMESPACE' => 'KOHA',
   'TEMPLATE_CACHE_DIR' => '/tmp/koha',
-  'FONT_DIR'          => '/usr/share/fonts/truetype/ttf-dejavu'
+  'FONT_DIR'          => '/usr/share/fonts/truetype/dejavu'
 );
 
 # set some default configuration options based on OS
diff --git a/debian/control b/debian/control
index b947d5c794..88f260d334 100644
--- a/debian/control
+++ b/debian/control
@@ -158,7 +158,7 @@ Build-Depends: libalgorithm-checkdigits-perl,
  libxml-writer-perl,
  libyaml-perl,
  libyaml-syck-perl,
- debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, ttf-dejavu,
+ debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, fonts-dejavu | ttf-dejavu,
  libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073)
 
 Package: koha-common
@@ -178,7 +178,7 @@ Depends: ${misc:Depends}, ${koha:Depends},
  pwgen,
  starman,
  sudo,
- ttf-dejavu,
+ fonts-dejavu | ttf-dejavu,
  unzip,
  xmlstarlet,
  yaz
@@ -227,7 +227,7 @@ Depends: ${misc:Depends},
  pwgen,
  starman,
  sudo,
- ttf-dejavu,
+ fonts-dejavu | ttf-dejavu,
  unzip,
  xmlstarlet,
  yaz
diff --git a/debian/control.in b/debian/control.in
index 395ba804c3..03023250ae 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,7 +10,7 @@ Standards-Version: 3.8.4
 # See debian/rules, the override_dh_gencontrol rules. 
 # There are some exceptions.
 Build-Depends:__AUTODEPENDS__,
- debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, ttf-dejavu,
+ debhelper (>= 7.0.50), gettext, xsltproc, docbook-xsl, fonts-dejavu | ttf-dejavu,
  libxml2-utils, bash-completion, perl-modules-5.26 | libtest-simple-perl (>= 1.302073)
 
 Package: koha-common
@@ -30,7 +30,7 @@ Depends: ${misc:Depends}, ${koha:Depends},
  starman,
  sudo,
  tinymce, 
- ttf-dejavu,
+ fonts-dejavu | ttf-dejavu,
  unzip,
  xmlstarlet,
  yaz
@@ -79,7 +79,7 @@ Depends: ${misc:Depends},
  starman,
  sudo,
  tinymce,
- ttf-dejavu,
+ fonts-dejavu | ttf-dejavu,
  unzip,
  xmlstarlet,
  yaz
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 0607997d6e..7caddfa4e3 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -328,18 +328,18 @@ __END_SRU_PUBLICSERVER__
 
  <!-- true type font mapping according to type from $font_types in C4/Creators/Lib.pm -->
  <ttf>
-    <font type="TR" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf</font>
-    <font type="TB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf</font>
-    <font type="TI" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Italic.ttf</font>
-    <font type="TBI">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldItalic.ttf</font>
-    <font type="C"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf</font>
-    <font type="CB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf</font>
-    <font type="CO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf</font>
-    <font type="CBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf</font>
-    <font type="H"  >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf</font>
-    <font type="HO" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf</font>
-    <font type="HB" >/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf</font>
-    <font type="HBO">/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf</font>
+    <font type="TR" >/usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf</font>
+    <font type="TB" >/usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf</font>
+    <font type="TI" >/usr/share/fonts/truetype/dejavu/DejaVuSerif-Italic.ttf</font>
+    <font type="TBI">/usr/share/fonts/truetype/dejavu/DejaVuSerif-BoldItalic.ttf</font>
+    <font type="C"  >/usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf</font>
+    <font type="CB" >/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf</font>
+    <font type="CO" >/usr/share/fonts/truetype/dejavu/DejaVuSansMono-Oblique.ttf</font>
+    <font type="CBO">/usr/share/fonts/truetype/dejavu/DejaVuSansMono-BoldOblique.ttf</font>
+    <font type="H"  >/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf</font>
+    <font type="HO" >/usr/share/fonts/truetype/dejavu/DejaVuSans-Oblique.ttf</font>
+    <font type="HB" >/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf</font>
+    <font type="HBO">/usr/share/fonts/truetype/dejavu/DejaVuSans-BoldOblique.ttf</font>
  </ttf>
 
  <!-- Path to the config file for SMS::Send -->
diff --git a/rewrite-config.PL b/rewrite-config.PL
index 8b886847f3..4e814d923c 100644
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -150,7 +150,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   "__USE_MEMCACHED__" => 'yes',
   "__MEMCACHED_SERVERS__" => "",
   "__MEMCACHED_NAMESPACE__" => "",
-  "__FONT_DIR__" => "/usr/share/fonts/truetype/ttf-dejavu",
+  "__FONT_DIR__" => "/usr/share/fonts/truetype/dejavu",
   "__TEMPLATE_CACHE_DIR__" => "/tmp/koha"
 );