diff --git a/.etckeeper b/.etckeeper
index 76bde79d..8a40cd64 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -18,6 +18,8 @@ mkdir -p './cups/interfaces'
 mkdir -p './cups/ssl'
 mkdir -p './dbus-1/session.d'
 mkdir -p './dconf/db'
+mkdir -p './gconf/gconf.xml.defaults'
+mkdir -p './gconf/gconf.xml.mandatory'
 mkdir -p './glvnd/egl_vendor.d'
 mkdir -p './gss/mech.d'
 mkdir -p './initramfs-tools/hooks'
@@ -850,6 +852,9 @@ maybe chmod 0644 'fonts/conf.avail/65-droid-sans-fallback.conf'
 maybe chmod 0755 'fonts/conf.d'
 maybe chmod 0644 'fonts/conf.d/README'
 maybe chmod 0644 'fonts/fonts.conf'
+maybe chmod 0755 'forticlient'
+maybe chmod 0600 'forticlient/config.db'
+maybe chmod 0644 'forticlient/custom_machine_id.conf'
 maybe chmod 0644 'fstab'
 maybe chmod 0644 'fuse.conf'
 maybe chmod 0755 'fwupd'
@@ -869,6 +874,8 @@ maybe chmod 0755 'gconf'
 maybe chmod 0755 'gconf/2'
 maybe chmod 0644 'gconf/2/evoldap.conf'
 maybe chmod 0644 'gconf/2/path'
+maybe chmod 0755 'gconf/gconf.xml.defaults'
+maybe chmod 0755 'gconf/gconf.xml.mandatory'
 maybe chmod 0755 'ghostscript'
 maybe chmod 0755 'ghostscript/cidfmap.d'
 maybe chmod 0644 'ghostscript/cidfmap.d/90gs-cjk-resource-cns1.conf'
diff --git a/forticlient/config.db b/forticlient/config.db
new file mode 100644
index 00000000..190572ec
Binary files /dev/null and b/forticlient/config.db differ
diff --git a/forticlient/custom_machine_id.conf b/forticlient/custom_machine_id.conf
new file mode 100644
index 00000000..efa9908f
--- /dev/null
+++ b/forticlient/custom_machine_id.conf
@@ -0,0 +1 @@
+4BAAFB98-5BFD-41EC-9E2E-E652D8D16A73
\ No newline at end of file
diff --git a/mailcap b/mailcap
index 5a1e01cb..0edc17b1 100644
--- a/mailcap
+++ b/mailcap
@@ -198,6 +198,7 @@ image/x-xcf; eom %s; test=test -n "$DISPLAY"
 image/x-xpixmap; eom %s; test=test -n "$DISPLAY"
 text/ico; eom %s; test=test -n "$DISPLAY"
 text/xml-svg; eom %s; test=test -n "$DISPLAY"
+x-scheme-handler/fabricagent; /opt/forticlient/gui/FortiClient-linux-x64/FortiClient %s; test=test -n "$DISPLAY"
 application/pkcs12; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
 application/pkcs12+pem; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
 application/pkcs7-mime; /usr/bin/gcr-viewer %s; test=test -n "$DISPLAY"
diff --git a/systemd/system/multi-user.target.wants/forticlient-scheduler.service b/systemd/system/multi-user.target.wants/forticlient-scheduler.service
new file mode 120000
index 00000000..2f496b37
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/forticlient-scheduler.service
@@ -0,0 +1 @@
+/lib/systemd/system/forticlient-scheduler.service
\ No newline at end of file
diff --git a/xdg/autostart/Fortitray.desktop b/xdg/autostart/Fortitray.desktop
new file mode 120000
index 00000000..6ddbcb6d
--- /dev/null
+++ b/xdg/autostart/Fortitray.desktop
@@ -0,0 +1 @@
+/opt/forticlient/Fortitray.desktop
\ No newline at end of file
diff --git a/xdg/autostart/Fortivpn.desktop b/xdg/autostart/Fortivpn.desktop
new file mode 120000
index 00000000..399a8d9c
--- /dev/null
+++ b/xdg/autostart/Fortivpn.desktop
@@ -0,0 +1 @@
+/opt/forticlient/Fortivpn.desktop
\ No newline at end of file