diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,9 @@ tags:
 # :ide: COMPILE: clean
 # . (let ((args "clean")) (compile (concat "make -k " args)))
 
+# :ide: COMPILE: doc
+# . (let ((args "doc")) (compile (concat "make -k " args)))
+
 # :ide: COMPILE: Standard
 # . (let ((args "")) (compile (concat "make -k " args)))
 #
diff --git a/doc/Makefile b/doc/Makefile
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -22,7 +22,7 @@ JPGS += ws-vacation.jpg
 JPGS += ws-vacation-user.jpg
 JPGS += ws-vacation-expert.jpg
 
-JPG_THUMBS = $(patsubst %.jpg, %-t.jpg, $(JPGS))
+SNIPPETS = ../lib/snippets.pl
 
 # use cp for Windows
 LN_S = cp
@@ -30,16 +30,18 @@ LN_S = ln -s
 
 TXT_PDFS = $(patsubst %.txt,%.pdf,$(TXTS))
 TXT_HTMLS = $(patsubst %.txt,%.html,$(TXTS)) $(patsubst %.txt,%.html,$(HTML_TXTS))
+
 #CLEANFILES += $(TXT_PDFS)
 #CLEANFILES += $(TXT_HTMLS)
 
-SNIPPETS = ../lib/snippets.pl
+JPG_THUMBS = $(patsubst %.jpg, %-t.jpg, $(JPGS))
+#CLEANFILES += $(JPG_THUMBS)
 
 DISTFILES =
 DISTFILES += Makefile
 DISTFILES += $(TXTS)
+DISTFILES += $(TXT_HTMLS)
 DISTFILES += $(TXT_PDFS)
-DISTFILES += $(TXT_HTMLS)
 DISTFILES += $(JPGS)
 DISTFILES += $(JPG_THUMBS)
 DISTFILES += $(EXTRA_DIST)
@@ -75,7 +77,7 @@ clean: clean-local
 clean-local:
 	find . -name '*.pyc' | xargs -r rm 
 
-install_top_dir = ../../wolfmanx.bitbucket.org
+install_top_dir = $(top_srcdir)/../wolfmanx.bitbucket.org
 install_dir = $(install_top_dir)/ws-vacation
 
 install: all
diff --git a/doc/index-template.txt b/doc/index-template.txt
--- a/doc/index-template.txt
+++ b/doc/index-template.txt
@@ -6,24 +6,9 @@
 %(stylesheet)s
     <script type="text/javascript"><!--
       // Add a trailing slash to the URL, if it does not end in `.html' or `/'.
-      // This is needed for relative links to work on bitbucket.org
-      my_url = document.location.href;
-      query = [];
-      spc_pos = my_url.indexOf('?');
-      if (spc_pos >= 0) {
-          query.unshift(my_url.substr(spc_pos));
-	  my_url = my_url.substr(0, spc_pos);
-      }
-      spc_pos = my_url.indexOf('#');
-      if (spc_pos >= 0) {
-          query.unshift(my_url.substr(spc_pos));
-	  my_url = my_url.substr(0, spc_pos);
-      }
-      if (my_url.indexOf('.html') < my_url.length - '.html'.length) {
-          if (my_url.substr(my_url.length - 1) != '/') {
-	      my_url += '/' + query.join('');
-	      document.location.href = my_url;
-          }
+      // Elegant solution from David Chambers [Atlassian]
+      if (!/(\.html|\/)$/.test(location.pathname)) {
+          location.pathname += '/';
       }
       $(document).ready(
 	  function() {
diff --git a/lib/config.php b/lib/config.php
--- a/lib/config.php
+++ b/lib/config.php
@@ -73,10 +73,11 @@
 $SUDO_OPT_H = ' -H';
 $WRITE_TO_CMD = dirname(__FILE__) . '/write_to.sh';
 
+$FORMAIL_CMD = '/usr/bin/formail';
 $VACATION_CMD = '/usr/bin/vacation';
 $VACATION_MSG_FILE = '.vacation.msg';
 $VACATION_DB_FILE = '.vacation.db';
-$VACATION_FORWARD_ENTRY = '"|/usr/bin/vacation %s"'; // use sprintf($VFE, $user);
+$VACATION_FORWARD_ENTRY = sprintf('"| %s -c | %s %%s"', $FORMAIL_CMD, $VACATION_CMD); // use sprintf($VFE, $user);
 $FORWARD_FILE = '.forward';
 $EXPERT_ENABLED = True;