diff --git a/Makefile.PL b/Makefile.PL
index e09860ca08..3342ab780b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -261,6 +261,7 @@ my $target_map = {
   './changelanguage.pl'         => 'INTRANET_CGI_DIR',
   './check_sysprefs.pl'         => 'NONE',
   './circ'                      => 'INTRANET_CGI_DIR',
+  './docs/history.txt'          => { target => 'DOC_DIR', trimdir => -1 },
   './offline_circ'		=> 'INTRANET_CGI_DIR',
   './edithelp.pl'               => 'INTRANET_CGI_DIR',
   './etc'                       => { target => 'KOHA_CONF_DIR', trimdir => -1 },
diff --git a/about.pl b/about.pl
index 3c641b3808..545f18ca30 100755
--- a/about.pl
+++ b/about.pl
@@ -145,8 +145,8 @@ $template->param( table => $table );
 ## Koha time line code
 
 #get file location
-my $dir = C4::Context->config('intranetdir');
-open( my $file, "<", "$dir" . "/docs/history.txt" );
+my $docdir = C4::Context->config('docdir');
+open( my $file, "<", "$docdir" . "/history.txt" );
 my $i = 0;
 
 my @rows2 = ();
diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in
index 1f1c521c6e..cf55ce5cec 100644
--- a/debian/templates/koha-conf-site.xml.in
+++ b/debian/templates/koha-conf-site.xml.in
@@ -263,6 +263,7 @@
  <intrahtdocs>/usr/share/koha/intranet/htdocs/intranet-tmpl</intrahtdocs>
  <includes>/usr/share/koha/intranet/htdocs/intranet-tmpl/prog/en/includes/</includes>
  <logdir>/var/log/koha/__KOHASITE__</logdir>
+ <docdir>/usr/share/doc/koha-common</docdir>
  <backupdir>/var/spool/koha/__KOHASITE__</backupdir>
  <!-- Enable the two following to allow superlibrarians to download
       database and configuration dumps (respectively) from the Export
diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
index 53d7ce8b35..1737a1d4d2 100644
--- a/etc/koha-conf.xml
+++ b/etc/koha-conf.xml
@@ -282,6 +282,7 @@ __PAZPAR2_TOGGLE_XML_POST__
  <intrahtdocs>__INTRANET_TMPL_DIR__</intrahtdocs>
  <includes>__INTRANET_TMPL_DIR__/prog/en/includes/</includes>
  <logdir>__LOG_DIR__</logdir>
+ <docdir>__DOC_DIR__</docdir>
  <backupdir>__BACKUP_DIR__</backupdir>
  <!-- Enable the two following to allow superlibrarians to download
       database and configuration dumps (respectively) from the Export