664 files changed, 2281 insertions, 659 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cc3614c99..81b9cfce4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build_ubuntu_package:
        - python3 contrib/sort.py etc/*.{profile,inc}
 build_debian_package:
-    image: debian:jessie
+    image: debian:stretch
    script:
        - apt-get update -qq
        - apt-get install -y -qq build-essential lintian pkg-config
diff --git a/README b/README
index 0fe479a8c..d33fa3e81 100644
--- a/README
+++ b/README
@@ -39,6 +39,7 @@ Committers
 - crass (https://github.com/crass)
 - glitsj16 (https://github.com/glitsj16)
 - Fred-Barclay (https://github.com/Fred-Barclay)
+- Kristóf Marussy (https://github.com/kris7t)
 - Reiner Herrmann (https://github.com/reinerh - Debian/Ubuntu maintainer)
 - rusty-snake (https://github.com/rusty-snake)
 - smithsohu (https://github.com/smitsohu)
@@ -160,6 +161,7 @@ Cat (https://github.com/ecat3)
        - prevent tmux connecting to an existing session
 creideiki (https://github.com/creideiki)
        - make the sandbox process reap all children
+        - tor browser profile fix
 chiraag-nataraj (https://github.com/chiraag-nataraj)
        - support for newer Xpra versions (2.1+)
        - added Viber, amule, ardour5, brackets, calligra, cin, fetchmail profiles
@@ -242,6 +244,9 @@ Fabian Würfl (https://github.com/BafDyce)
        - Liferea profile
 Felipe Barriga Richards (https://github.com/fbarriga)
        - --private-etc fix
+Florian Begusch (https://github.com/florianbegusch)
+        - (la)tex profiles
+        - fixed transmission-common.profile
 floxo (https://github.com/floxo)
        - fixed qml disk cache issue
 Franco (nextime) Lanza (https://github.com/nextime)
@@ -332,6 +337,8 @@ glitsj16 (https://github.com/glitsj16)
        - new profiles: masterpdfeditor
 gm10 (https://github.com/gm10)
        - get_user() do not use the unreliable getlogin()
+GovanifY (https://github.com/GovanifY)
+        - Blacklisting openrc paths by defaults
 graywolf (https://github.com/graywolf)
        - spelling fix
 greigdp (https://github.com/greigdp)
@@ -343,6 +350,8 @@ grizzlyuser (https://github.com/grizzlyuser)
        - added support for youtube-dl in smplayer profile
 GSI (https://github.com/GSI)
        - added Uzbl browser profile
+haarp (https://github.com/haarp)
+        - Allow sound for hexchat
 hamzadis (https://github.com/hamzadis)
        - added --overlay-named=name and --overlay-path=path
 hawkey116477 (https://github.com/hawkeye116477)
@@ -444,6 +453,8 @@ Kishore96in (https://github.com/Kishore96in)
        - added falkon profile
 KOLANICH (https://github.com/KOLANICH)
        - added symlink fixer fix_private-bin.py in contrib section
+Kristóf Marussy (https://github.com/kris7t)
+        - dns support
 Kunal Mehta (https://github.com/legoktm)
        - converted all links to https in manpages
 laniakea64 (https://github.com/laniakea64)
@@ -503,6 +514,8 @@ mustaqimM (https://github.com/mustaqimM)
    - added profile for Nylas Mail
 n1trux (https://github.com/n1trux)
        - fix flashpeak-slimjet profile typos
+nblock (https://github.com/nblock)
+        - cmus: allow access to resolv.conf
 Nick Fox (https://github.com/njfox)
        - add a profile alias for code-oss
        - add code-oss config directory
@@ -861,4 +874,4 @@ Zack Weinberg (https://github.com/zackw)
          with firejail --x11
        - support for xpra-extra-params in firejail.config
-Copyright (C) 2014-2019 Firejail Authors
+Copyright (C) 2014-2020 Firejail Authors
diff --git a/README.md b/README.md
index 8d012fabf..f6ce3b68f 100644
--- a/README.md
+++ b/README.md
@@ -145,14 +145,10 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
 `````
 `````
-## Latest released version: 0.9.60 - release 0.9.62 pending
+## Latest released version: 0.9.62
-The development for 0.9.62 is handled on release-0.9.62 branch.
+## Current development version: 0.9.63
-I had to cut the release branch again as of this commit - big fixes from @smitsohu and @glitsj16.
-Also problems with the configure script as reported by @matu3ba. I am reusing the same
-name for the release branch, release-0.9.62, so if you have an old release-0.9.62 branch around,
-get rid of it and load the new one.
+### New profiles:
-## Current development version: 0.9.63
+gfeeds, firefox-x11, tvbrowser, rtv, clipgrab, gnome-passwordsafe, bibtex, gummi, latex, pdflatex, tex, wpp, wpspdf, wps, et
diff --git a/RELNOTES b/RELNOTES
index 202d7a366..9541cef74 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,5 +1,11 @@
-firejail (0.9.61) baseline; urgency=low
+firejail (0.9.63) baseline; urgency=low
  * work in progress
+  * DHCP client support
+  * new profiles: gfeeds, firefox-x11, tvbrowser, rtv, clipgrab
+  * new profiles: gnome-passwordsafe, bibtex, gummi, latex
+  * new profiles: pdflatex, tex, wpp, wpspdf, wps, et
+firejail (0.9.62) baseline; urgency=low
  * added file-copy-limit in /etc/firejail/firejail.config
  * profile templates (/usr/share/doc/firejail)
  * allow-debuggers support in profiles
diff --git a/SECURITY.md b/SECURITY.md
index 558b6870a..46942a936 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,7 +4,8 @@
 | Version | Supported by us    | EOL  | Supported by distribution |
 | ------- | ------------------ | ---- | ---------------------------
-| 0.9.60  | :heavy_check_mark: |      | :white_check_mark: Debian 11 (testing/unstable), 10 **backports**; Ubuntu 19.10
+| 0.9.62  | :heavy_check_mark: |      | :white_check_mark: Debian 11 (testing/unstable), 10 **backports**; Ubuntu 20.04
+| 0.9.60  | :x:                |      | :white_check_mark: Ubuntu 19.10
 | 0.9.58  | :x:                |      | :white_check_mark: Ubuntu 19.04; Debian 9 **backports**, 10
 | 0.9.56  | :x:                | 27 Jan 2019 |
 | 0.9.54  | :x:                |      | :white_check_mark: Ubuntu 18.10
diff --git a/contrib/fj-mkdeb.py b/contrib/fj-mkdeb.py
index 89b4e46a9..429cb9db4 100755
--- a/contrib/fj-mkdeb.py
+++ b/contrib/fj-mkdeb.py
@@ -1,6 +1,9 @@
 #!/usr/bin/env python3
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
-# This script is automate the workaround for https://github.com/netblue30/firejail/issues/772
+# This script automates the workaround for https://github.com/netblue30/firejail/issues/772
 import os, re, shlex, subprocess, sys
diff --git a/contrib/fjclip.py b/contrib/fjclip.py
index e374479a1..66038430d 100755
--- a/contrib/fjclip.py
+++ b/contrib/fjclip.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 import sys
 import subprocess
diff --git a/contrib/fjdisplay.py b/contrib/fjdisplay.py
index e6c1476f6..f1880283b 100755
--- a/contrib/fjdisplay.py
+++ b/contrib/fjdisplay.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 import re
 import sys
diff --git a/contrib/fjresize.py b/contrib/fjresize.py
index b29b170ef..6ab963c58 100755
--- a/contrib/fjresize.py
+++ b/contrib/fjresize.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 import sys
 import fjdisplay
diff --git a/contrib/gdb-firejail.sh b/contrib/gdb-firejail.sh
index 3ee3fffb3..7a351c065 100755
--- a/contrib/gdb-firejail.sh
+++ b/contrib/gdb-firejail.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set -x
 # gdb setuid helper script.
@@ -18,4 +21,4 @@ else
 fi
 bash -c "kill -STOP \$\$; exec \"\$0\" \"\$@\"" "$@" &
-sudo gdb -e  "$FIREJAIL" -p "$!"
-\ No newline at end of file
+sudo gdb -e  "$FIREJAIL" -p "$!"
diff --git a/contrib/jail_prober.py b/contrib/jail_prober.py
index b18834820..6f8e98b6a 100755
--- a/contrib/jail_prober.py
+++ b/contrib/jail_prober.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 """
 Figure out which profile options may be causing a particular program to break
 when run in firejail.
diff --git a/contrib/sort.py b/contrib/sort.py
index f77e2a1fc..e2f82012b 100755
--- a/contrib/sort.py
+++ b/contrib/sort.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python3
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 """
 Sort the items of multi-item options in profiles, the following options are supported:
  private-bin, private-etc, private-lib, caps.drop, caps.keep, seccomp.drop, seccomp.drop, protocol
diff --git a/contrib/syscalls.sh b/contrib/syscalls.sh
index 9ab6acf5b..c9cbad4a6 100755
--- a/contrib/syscalls.sh
+++ b/contrib/syscalls.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 STRACE_OUTPUT_FILE="$(pwd)/strace_output.txt"
 SYSCALLS_OUTPUT_FILE="$(pwd)/syscalls.txt"
diff --git a/contrib/update_deb.sh b/contrib/update_deb.sh
index fa1b2d692..d417a09ea 100755
--- a/contrib/update_deb.sh
+++ b/contrib/update_deb.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 # Purpose: Fetch, compile, and install firejail from GitHub source. For
 # Debian-based distros only (Ubuntu, Mint, etc).
 set -e
diff --git a/dummy.c b/dummy.c
index 061ed7eef..fbf3dd775 100644
--- a/dummy.c
+++ b/dummy.c
@@ -1,3 +1,7 @@
+// This file is part of Firejail project
+// Copyright (C) 2014-2020 Firejail Authors
+// License GPL v2
 int main(void) {
        return 0;
 }
diff --git a/etc/7z.profile b/etc/7z.profile
index 5ff02e1c0..b60bb9ee9 100644
--- a/etc/7z.profile
+++ b/etc/7z.profile
@@ -7,6 +7,8 @@ include 7z.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/allow-common-devel.inc b/etc/allow-common-devel.inc
index 1d794462c..63174eda6 100644
--- a/etc/allow-common-devel.inc
+++ b/etc/allow-common-devel.inc
@@ -1,17 +1,21 @@
-# Rust
+# This file is overwritten during software install.
-noblacklist ${HOME}/.cargo/config
+# Persistent customizations should go in a .local file.
-noblacklist ${HOME}/.cargo/registry
+include allow-common-devel.local
 # Git
 noblacklist ${HOME}/.config/git
 noblacklist ${HOME}/.gitconfig
 noblacklist ${HOME}/.git-credentials
+# Java
+noblacklist ${HOME}/.gradle
+noblacklist ${HOME}/.java
 # Python
 noblacklist ${HOME}/.python-history
 noblacklist ${HOME}/.python_history
 noblacklist ${HOME}/.pythonhist
-# Java
+# Rust
-noblacklist ${HOME}/.gradle
+noblacklist ${HOME}/.cargo/config
-noblacklist ${HOME}/.java
+noblacklist ${HOME}/.cargo/registry
diff --git a/etc/allow-gjs.inc b/etc/allow-gjs.inc
new file mode 100644
index 000000000..f552ede9d
--- /dev/null
+++ b/etc/allow-gjs.inc
@@ -0,0 +1,10 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-gjs.local
+noblacklist ${PATH}/gjs
+noblacklist ${PATH}/gjs-console
+noblacklist /usr/lib/gjs
+noblacklist /usr/lib64/gjs
+noblacklist /usr/lib/libgjs*
+noblacklist /usr/lib64/libgjs*
diff --git a/etc/allow-java.inc b/etc/allow-java.inc
index 5204d2dea..24d18fb77 100644
--- a/etc/allow-java.inc
+++ b/etc/allow-java.inc
@@ -1,6 +1,9 @@
-noblacklist ${HOME}/.java
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-java.local
+noblacklist ${HOME}/.java
 noblacklist ${PATH}/java
-noblacklist /usr/lib/java
 noblacklist /etc/java
+noblacklist /usr/lib/java
 noblacklist /usr/share/java
diff --git a/etc/allow-lua.inc b/etc/allow-lua.inc
index 51d76f9b1..fbdee22ee 100644
--- a/etc/allow-lua.inc
+++ b/etc/allow-lua.inc
@@ -1,3 +1,7 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-lua.local
 noblacklist ${PATH}/lua*
 noblacklist /usr/include/lua*
 noblacklist /usr/lib/lua
diff --git a/etc/allow-perl.inc b/etc/allow-perl.inc
index d37328936..f44e1e3cc 100644
--- a/etc/allow-perl.inc
+++ b/etc/allow-perl.inc
@@ -1,5 +1,9 @@
-noblacklist ${PATH}/cpan*
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-perl.local
 noblacklist ${PATH}/core_perl
+noblacklist ${PATH}/cpan*
 noblacklist ${PATH}/perl
 noblacklist ${PATH}/site_perl
 noblacklist ${PATH}/vendor_perl
diff --git a/etc/allow-php.inc b/etc/allow-php.inc
new file mode 100644
index 000000000..a0950dc26
--- /dev/null
+++ b/etc/allow-php.inc
@@ -0,0 +1,7 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-php.local
+noblacklist ${PATH}/php*
+noblacklist /usr/lib/php*
+noblacklist /usr/share/php*
diff --git a/etc/allow-python2.inc b/etc/allow-python2.inc
index 8ea61648b..b0525e2e1 100644
--- a/etc/allow-python2.inc
+++ b/etc/allow-python2.inc
@@ -1,3 +1,7 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-python2.local
 noblacklist ${PATH}/python2*
 noblacklist /usr/include/python2*
 noblacklist /usr/lib/python2*
diff --git a/etc/allow-python3.inc b/etc/allow-python3.inc
index 91c7ffca4..d968886b0 100644
--- a/etc/allow-python3.inc
+++ b/etc/allow-python3.inc
@@ -1,5 +1,10 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-python3.local
 noblacklist ${PATH}/python3*
 noblacklist /usr/include/python3*
 noblacklist /usr/lib/python3*
+noblacklist /usr/lib64/python3*
 noblacklist /usr/local/lib/python3*
 noblacklist /usr/share/python3*
diff --git a/etc/allow-ruby.inc b/etc/allow-ruby.inc
index 3165a981a..a8c701219 100644
--- a/etc/allow-ruby.inc
+++ b/etc/allow-ruby.inc
@@ -1,2 +1,6 @@
+# This file is overwritten during software install.
+# Persistent customizations should go in a .local file.
+include allow-ruby.local
 noblacklist ${PATH}/ruby
 noblacklist /usr/lib/ruby
diff --git a/etc/anki.profile b/etc/anki.profile
index c349376ff..a0a79ef48 100644
--- a/etc/anki.profile
+++ b/etc/anki.profile
@@ -42,7 +42,8 @@ notv
 nou2f
 novideo
 protocol unix,inet,inet6
-seccomp
+# QtWebengine needs chroot to set up its own sandbox
+seccomp !chroot
 shell none
 tracelog
diff --git a/etc/ar.profile b/etc/ar.profile
index 6b1fb830c..e28370450 100644
--- a/etc/ar.profile
+++ b/etc/ar.profile
@@ -7,6 +7,8 @@ include ar.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/aria2c.profile b/etc/aria2c.profile
index 2fb6dd25f..7819300af 100644
--- a/etc/aria2c.profile
+++ b/etc/aria2c.profile
@@ -7,8 +7,11 @@ include aria2c.local
 include globals.local
 noblacklist ${HOME}/.aria2
+noblacklist ${HOME}/.config/aria2
+noblacklist ${HOME}/.netrc
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
@@ -37,6 +40,7 @@ seccomp
 shell none
 # disable-mnt
+# Add your custom event hook commands to 'private-bin' in your aria2c.local
 private-bin aria2c,gzip
 # Uncomment the next line (or put 'private-cache' in your aria2c.local) if you don't use Lutris/winetricks (see issue #2772)
 #private-cache
diff --git a/etc/artha.profile b/etc/artha.profile
index 31f8887c4..aaaede7ee 100644
--- a/etc/artha.profile
+++ b/etc/artha.profile
@@ -11,6 +11,7 @@ noblacklist ${HOME}/.config/artha.log
 noblacklist ${HOME}/.config/enchant
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/atool.profile b/etc/atool.profile
index fb75c8408..0250451fc 100644
--- a/etc/atool.profile
+++ b/etc/atool.profile
@@ -7,6 +7,8 @@ include atool.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 # Allow perl (blacklisted by disable-interpreters.inc)
 include allow-perl.inc
diff --git a/etc/audio-recorder.profile b/etc/audio-recorder.profile
index afd1033de..b2ed3b030 100644
--- a/etc/audio-recorder.profile
+++ b/etc/audio-recorder.profile
@@ -40,7 +40,6 @@ protocol unix
 seccomp
 shell none
 tracelog
-x11 none
 disable-mnt
 # private-bin audio-recorder
diff --git a/etc/baobab.profile b/etc/baobab.profile
index e8287b448..18c862a4d 100644
--- a/etc/baobab.profile
+++ b/etc/baobab.profile
@@ -12,6 +12,7 @@ include disable-exec.inc
 include disable-interpreters.inc
 include disable-passwdmgr.inc
 # include disable-programs.inc
+# include disable-xdg.inc
 caps.drop all
 net none
@@ -32,3 +33,5 @@ shell none
 private-bin baobab
 private-dev
 private-tmp
+read-only ${HOME}
diff --git a/etc/beaker.profile b/etc/beaker.profile
index 21eeac4b3..cc1886a49 100644
--- a/etc/beaker.profile
+++ b/etc/beaker.profile
@@ -13,7 +13,6 @@ include disable-interpreters.inc
 mkdir ${HOME}/.config/Beaker Browser
 whitelist ${HOME}/.config/Beaker Browser
-whitelist ${DOWNLOADS}
 include whitelist-common.inc
 # Redirect
diff --git a/etc/bibtex.profile b/etc/bibtex.profile
new file mode 100644
index 000000000..e868dcbab
--- /dev/null
+++ b/etc/bibtex.profile
@@ -0,0 +1,12 @@
+# Firejail profile for bibtex
+# This file is overwritten after every install/update
+# Persistent local customizations
+include bibtex.local
+# Persistent global definitions
+include globals.local
+private-bin bibtex
+# Redirect
+include latex-common.profile
diff --git a/etc/bsdtar.profile b/etc/bsdtar.profile
index 17c67ed26..5ce9b6406 100644
--- a/etc/bsdtar.profile
+++ b/etc/bsdtar.profile
@@ -6,6 +6,8 @@ include bsdtar.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 # include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/celluloid.profile b/etc/celluloid.profile
index ab68c7f13..d099ba11e 100644
--- a/etc/celluloid.profile
+++ b/etc/celluloid.profile
@@ -24,12 +24,13 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
+include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
 apparmor
 caps.drop all
 netfilter
-# nodbus -- uses dconf
+# nodbus -- uses dconf, MPRIS
 nogroups
 nonewprivs
 noroot
@@ -45,3 +46,5 @@ private-etc alternatives,ca-certificates,crypto-policies,dconf,drirc,fonts,gtk-3
 private-dev
 private-tmp
+read-only ${HOME}
+read-write ${HOME}/.config/celluloid
diff --git a/etc/checkbashisms.profile b/etc/checkbashisms.profile
index c66776b9f..e15131dca 100644
--- a/etc/checkbashisms.profile
+++ b/etc/checkbashisms.profile
@@ -7,6 +7,8 @@ include checkbashisms.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${DOCUMENTS}
 # Allow perl (blacklisted by disable-interpreters.inc)
diff --git a/etc/chromium-common.profile b/etc/chromium-common.profile
index 7b88e417a..c54fb0e19 100644
--- a/etc/chromium-common.profile
+++ b/etc/chromium-common.profile
@@ -37,7 +37,7 @@ notv
 shell none
 disable-mnt
-private-dev
+?BROWSER_DISABLE_U2F: private-dev
 # private-tmp - problems with multiple browser sessions
 # the file dialog needs to work without d-bus
diff --git a/etc/clamav.profile b/etc/clamav.profile
index 45e7723eb..51bc58108 100644
--- a/etc/clamav.profile
+++ b/etc/clamav.profile
@@ -7,6 +7,8 @@ include clamav.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-exec.inc
 caps.drop all
diff --git a/etc/claws-mail.profile b/etc/claws-mail.profile
index f07e2039b..24954b2d8 100644
--- a/etc/claws-mail.profile
+++ b/etc/claws-mail.profile
@@ -7,43 +7,16 @@ include claws-mail.local
 include globals.local
 noblacklist ${HOME}/.claws-mail
-noblacklist ${HOME}/.gnupg
-noblacklist ${HOME}/.signature
-# when storing mail outside the default ${HOME}/Mail path, 'noblacklist' the custom path in your claws-mail.local
-# and 'blacklist' it in your disable-common.local too so it is  kept hidden from other applications
-noblacklist ${HOME}/Mail
-include disable-common.inc
+mkdir ${HOME}/.claws-mail
-include disable-devel.inc
+whitelist ${HOME}/.claws-mail
-include disable-interpreters.inc
-include disable-passwdmgr.inc
-include disable-programs.inc
-whitelist /usr/share/doc/claws-mail
+# If you use python-based plugins you need to uncomment the below (or put them in your claws-mail.local)
-whitelist /usr/share/gnupg
+# Allow python (blacklisted by disable-interpreters.inc)
-whitelist /usr/share/gnupg2
+#include allow-python2.inc
-include whitelist-usr-share-common.inc
+#include allow-python3.inc
-caps.drop all
-netfilter
-no3d
-nodvd
-nogroups
-nonewprivs
-noroot
-nosound
-notv
-nou2f
-novideo
-protocol unix,inet,inet6
-seccomp
-shell none
-private-cache
+whitelist /usr/share/doc/claws-mail
-private-dev
-private-tmp
-# If you want to read local mail stored in /var/mail, add the following to claws-mail.local:
+# Redirect
-# noblacklist /var/mail
+include email-common.profile
-# noblacklist /var/spool/mail
-# writable-var
diff --git a/etc/clipgrab.profile b/etc/clipgrab.profile
new file mode 100644
index 000000000..786d1c866
--- /dev/null
+++ b/etc/clipgrab.profile
@@ -0,0 +1,45 @@
+# Firejail profile for clipgrab
+# Description: A free video downloader and converter
+# This file is overwritten after every install/update
+# Persistent local customizations
+include clipgrab.local
+# Persistent global definitions
+include globals.local
+noblacklist ${HOME}/.config/Philipp Schmieder
+noblacklist ${HOME}/.pki
+noblacklist ${VIDEOS}
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
+include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
+apparmor
+caps.drop all
+machine-id
+netfilter
+# Breaks tray-icon, uncommend or add to clipgrab.local if you don't need it.
+#nodbus
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix,inet,inet6,netlink
+seccomp !chroot
+shell none
+disable-mnt
+private-cache
+private-dev
+private-tmp
diff --git a/etc/cmus.profile b/etc/cmus.profile
index 7e12a06de..fa1e5d722 100644
--- a/etc/cmus.profile
+++ b/etc/cmus.profile
@@ -27,4 +27,4 @@ seccomp
 shell none
 private-bin cmus
-private-etc alternatives,asound.conf,ca-certificates,crypto-policies,group,machine-id,pki,pulse,ssl
+private-etc alternatives,asound.conf,ca-certificates,crypto-policies,group,machine-id,pki,pulse,resolv.conf,ssl
diff --git a/etc/cpio.profile b/etc/cpio.profile
index 17a765700..1156b7439 100644
--- a/etc/cpio.profile
+++ b/etc/cpio.profile
@@ -7,6 +7,8 @@ include cpio.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist /sbin
 noblacklist /usr/sbin
diff --git a/etc/curl.profile b/etc/curl.profile
index 2624e5545..3f93e5f7e 100644
--- a/etc/curl.profile
+++ b/etc/curl.profile
@@ -9,10 +9,14 @@ include globals.local
 noblacklist ${HOME}/.curlrc
+blacklist /tmp/.X11-unix
 include disable-common.inc
 include disable-exec.inc
 include disable-passwdmgr.inc
 include disable-programs.inc
+# depending on workflow you can uncomment the below or put 'include disable-xdg.inc' in your curl.local
+#include disable-xdg.inc
 include whitelist-usr-share-common.inc
@@ -33,6 +37,7 @@ novideo
 protocol inet,inet6
 seccomp
 shell none
+tracelog
 # private-bin curl
 private-cache
diff --git a/etc/dconf.profile b/etc/dconf.profile
index ebb362fb6..2ee573463 100644
--- a/etc/dconf.profile
+++ b/etc/dconf.profile
@@ -6,6 +6,8 @@ include dconf.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/ddgtk.profile b/etc/ddgtk.profile
index ef65046e1..3dfc657bc 100644
--- a/etc/ddgtk.profile
+++ b/etc/ddgtk.profile
@@ -43,7 +43,6 @@ protocol unix
 seccomp
 shell none
 tracelog
-x11 none
 disable-mnt
 private-bin bash,dd,ddgtk,grep,lsblk,python*,sed,sh,tr
diff --git a/etc/devhelp.profile b/etc/devhelp.profile
index 5c1935835..cc9553e73 100644
--- a/etc/devhelp.profile
+++ b/etc/devhelp.profile
@@ -16,6 +16,8 @@ include disable-programs.inc
 include disable-xdg.inc
 whitelist /usr/share/devhelp
+whitelist /usr/share/doc
+whitelist /usr/share/gtk-doc/html
 include whitelist-common.inc
 include whitelist-usr-share-common.inc
diff --git a/etc/devilspie.profile b/etc/devilspie.profile
index ad891ffaf..b561787d8 100644
--- a/etc/devilspie.profile
+++ b/etc/devilspie.profile
@@ -6,6 +6,8 @@ include devilspie.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.devilspie
 include disable-common.inc
@@ -41,6 +43,7 @@ protocol unix
 seccomp
 shell none
 tracelog
+x11 none
 disable-mnt
 private-bin devilspie
diff --git a/etc/devilspie2.profile b/etc/devilspie2.profile
index f2bacda9a..9eab3f536 100644
--- a/etc/devilspie2.profile
+++ b/etc/devilspie2.profile
@@ -4,55 +4,21 @@
 # Persistent local customizations
 include devilspie2.local
 # Persistent global definitions
-include globals.local
+#include globals.local
+blacklist ${HOME}/.devilspie
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.config/devilspie2
 # Allow lua (blacklisted by disable-interpreters.inc)
 include allow-lua.inc
-include disable-common.inc
-include disable-devel.inc
-include disable-exec.inc
-include disable-interpreters.inc
-include disable-passwdmgr.inc
-include disable-programs.inc
-include disable-xdg.inc
 mkdir ${HOME}/.config/devilspie2
 whitelist ${HOME}/.config/devilspie2
-include whitelist-common.inc
-include whitelist-usr-share-common.inc
-include whitelist-var-common.inc
-apparmor
-caps.drop all
-ipc-namespace
-machine-id
-net none
-no3d
-nodbus
-nodvd
-nogroups
-nonewprivs
-noroot
-nosound
-notv
-nou2f
-novideo
-protocol unix
-seccomp
-shell none
-tracelog
-disable-mnt
 private-bin devilspie2
-private-cache
-private-dev
-private-etc alternatives
-private-lib gconv
-private-tmp
-memory-deny-write-execute
-read-only ${HOME}
+# Redirect
+include devilspie.profile
diff --git a/etc/dig.profile b/etc/dig.profile
index af71ff17f..054e4891d 100644
--- a/etc/dig.profile
+++ b/etc/dig.profile
@@ -9,6 +9,8 @@ include globals.local
 noblacklist ${HOME}/.digrc
+blacklist /tmp/.X11-unix
 include disable-common.inc
 # include disable-devel.inc
 include disable-exec.inc
@@ -24,7 +26,7 @@ include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
 caps.drop all
-# ipc-namespace
+ipc-namespace
 machine-id
 netfilter
 no3d
@@ -40,6 +42,7 @@ novideo
 protocol unix,inet,inet6
 seccomp
 shell none
+tracelog
 disable-mnt
 private
diff --git a/etc/digikam.profile b/etc/digikam.profile
index 1b80981f7..e66434444 100644
--- a/etc/digikam.profile
+++ b/etc/digikam.profile
@@ -32,7 +32,8 @@ nonewprivs
 noroot
 notv
 protocol unix,inet,inet6,netlink
-seccomp
+# QtWebengine needs chroot to set up its own sandbox
+seccomp !chroot
 shell none
 # private-dev - prevents libdc1394 loading; this lib is used to connect to a camera device
diff --git a/etc/disable-common.inc b/etc/disable-common.inc
index f50e10a00..9f351a673 100644
--- a/etc/disable-common.inc
+++ b/etc/disable-common.inc
@@ -151,6 +151,11 @@ blacklist /var/lib/systemd
 # blacklist /var/run/systemd
 # creates problems on Arch where /etc/resolv.conf is a symlink to /var/run/systemd/resolve/resolv.conf
+# openrc
+blacklist /etc/runlevels/
+blacklist /etc/init.d/
+blacklist /etc/rc.conf
 # VirtualBox
 blacklist ${HOME}/.VirtualBox
 blacklist ${HOME}/.config/VirtualBox
@@ -193,7 +198,7 @@ blacklist /var/lib/mysqld/mysql.sock
 blacklist /var/lib/pacman
 blacklist /var/lib/upower
 # blacklist /var/log - a virtual /var/log directory (mostly empty) is build up by default for
-# every sandbox, unless --writeble-var-log switch is activated
+# every sandbox, unless --writable-var-log switch is activated
 blacklist /var/mail
 blacklist /var/opt
 blacklist /var/run/acpid.socket
diff --git a/etc/disable-interpreters.inc b/etc/disable-interpreters.inc
index 4c4eed25d..ae539e1bc 100644
--- a/etc/disable-interpreters.inc
+++ b/etc/disable-interpreters.inc
@@ -2,6 +2,14 @@
 # Persistent customizations should go in a .local file.
 include disable-interpreters.local
+# gjs
+blacklist ${PATH}/gjs
+blacklist ${PATH}/gjs-console
+blacklist /usr/lib/gjs
+blacklist /usr/lib64/gjs
+blacklist /usr/lib/libgjs*
+blacklist /usr/lib64/libgjs*
 # Lua
 blacklist ${PATH}/lua*
 blacklist /usr/include/lua*
@@ -47,5 +55,6 @@ blacklist /usr/share/python2*
 blacklist ${PATH}/python3*
 blacklist /usr/include/python3*
 blacklist /usr/lib/python3*
+blacklist /usr/lib64/python3*
 blacklist /usr/local/lib/python3*
 blacklist /usr/share/python3*
diff --git a/etc/disable-programs.inc b/etc/disable-programs.inc
index 1c97ed8d6..baa9c3fab 100644
--- a/etc/disable-programs.inc
+++ b/etc/disable-programs.inc
@@ -85,6 +85,7 @@ blacklist ${HOME}/.config/Gpredict
 blacklist ${HOME}/.config/INRIA
 blacklist ${HOME}/.config/InSilmaril
 blacklist ${HOME}/.config/Kid3
+blacklist ${HOME}/.config/Kingsoft
 blacklist ${HOME}/.config/Luminance
 blacklist ${HOME}/.config/Meltytech
 blacklist ${HOME}/.config/Mendeley Ltd.
@@ -97,6 +98,7 @@ blacklist ${HOME}/.config/MusicBrainz
 blacklist ${HOME}/.config/Nathan Osman
 blacklist ${HOME}/.config/Nylas Mail
 blacklist ${HOME}/.config/PBE
+blacklist ${HOME}/.config/Philipp Schmieder
 blacklist ${HOME}/.config/QGIS
 blacklist ${HOME}/.config/QMediathekView
 blacklist ${HOME}/.config/Qlipper
@@ -118,6 +120,7 @@ blacklist ${HOME}/.config/akonadi*
 blacklist ${HOME}/.config/akregatorrc
 blacklist ${HOME}/.config/ardour4
 blacklist ${HOME}/.config/ardour5
+blacklist ${HOME}/.config/aria2
 blacklist ${HOME}/.config/arkrc
 blacklist ${HOME}/.config/artha.conf
 blacklist ${HOME}/.config/artha.log
@@ -198,6 +201,7 @@ blacklist ${HOME}/.config/google-chrome-beta
 blacklist ${HOME}/.config/google-chrome-unstable
 blacklist ${HOME}/.config/gpicview
 blacklist ${HOME}/.config/gthumb
+blacklist ${HOME}/.config/gummi
 blacklist ${HOME}/.config/gwenviewrc
 blacklist ${HOME}/.config/hexchat
 blacklist ${HOME}/.config/i2p
@@ -290,6 +294,7 @@ blacklist ${HOME}/.config/redshift
 blacklist ${HOME}/.config/redshift.conf
 blacklist ${HOME}/.config/remmina
 blacklist ${HOME}/.config/ristretto
+blacklist ${HOME}/.config/rtv
 blacklist ${HOME}/.config/scribus
 blacklist ${HOME}/.config/scribusrc
 blacklist ${HOME}/.config/sinew.in
@@ -311,6 +316,7 @@ blacklist ${HOME}/.config/tox
 blacklist ${HOME}/.config/transgui
 blacklist ${HOME}/.config/transmission
 blacklist ${HOME}/.config/truecraft
+blacklist ${HOME}/.config/tvbrowser
 blacklist ${HOME}/.config/uGet
 blacklist ${HOME}/.config/uzbl
 blacklist ${HOME}/.config/viewnior
@@ -454,6 +460,7 @@ blacklist ${HOME}/.kde4/share/config/ktorrentrc
 blacklist ${HOME}/.kde4/share/config/okularpartrc
 blacklist ${HOME}/.kde4/share/config/okularrc
 blacklist ${HOME}/.killingfloor
+blacklist ${HOME}/.kingsoft
 blacklist ${HOME}/.kino-history
 blacklist ${HOME}/.kinorc
 blacklist ${HOME}/.klatexformula
@@ -470,6 +477,7 @@ blacklist ${HOME}/.local/share/Anki2
 blacklist ${HOME}/.local/share/Empathy
 blacklist ${HOME}/.local/share/Enpass
 blacklist ${HOME}/.local/share/JetBrains
+blacklist ${HOME}/.local/share/Kingsoft
 blacklist ${HOME}/.local/share/Mendeley Ltd.
 blacklist ${HOME}/.local/share/Mumble
 blacklist ${HOME}/.local/share/PBE
@@ -573,6 +581,7 @@ blacklist ${HOME}/.local/share/qpdfview
 blacklist ${HOME}/.local/share/qutebrowser
 blacklist ${HOME}/.local/share/remmina
 blacklist ${HOME}/.local/share/rhythmbox
+blacklist ${HOME}/.local/share/rtv
 blacklist ${HOME}/.local/share/scribus
 blacklist ${HOME}/.local/share/signal-cli
 blacklist ${HOME}/.local/share/spotify
@@ -662,6 +671,7 @@ blacklist ${HOME}/.torcs
 blacklist ${HOME}/.tremulous
 blacklist ${HOME}/.ts3client
 blacklist ${HOME}/.tuxguitar*
+blacklist ${HOME}/.tvbrowser
 blacklist ${HOME}/.unknown-horizons
 blacklist ${HOME}/.viking
 blacklist ${HOME}/.viking-maps
@@ -737,15 +747,17 @@ blacklist ${HOME}/.cache/freecol
 blacklist ${HOME}/.cache/gajim
 blacklist ${HOME}/.cache/gegl-0.4
 blacklist ${HOME}/.cache/geeqie
+blacklist ${HOME}/.cache/gfeeds
 blacklist ${HOME}/.cache/gimp
+blacklist ${HOME}/.cache/gnome-builder
+blacklist ${HOME}/.cache/gnome-recipes
+blacklist ${HOME}/.cache/gnome-twitch
 blacklist ${HOME}/.cache/godot
 blacklist ${HOME}/.cache/google-chrome
 blacklist ${HOME}/.cache/google-chrome-beta
 blacklist ${HOME}/.cache/google-chrome-unstable
-blacklist ${HOME}/.cache/gnome-builder
-blacklist ${HOME}/.cache/gnome-recipes
-blacklist ${HOME}/.cache/gnome-twitch
 blacklist ${HOME}/.cache/gradio
+blacklist ${HOME}/.cache/gummi
 blacklist ${HOME}/.cache/icedove
 blacklist ${HOME}/.cache/INRIA/Natron
 blacklist ${HOME}/.cache/inkscape
diff --git a/etc/dnscrypt-proxy.profile b/etc/dnscrypt-proxy.profile
index d0430d5ca..6637b8d02 100644
--- a/etc/dnscrypt-proxy.profile
+++ b/etc/dnscrypt-proxy.profile
@@ -7,6 +7,9 @@ include dnscrypt-proxy.local
 # Persistent global definitions
 include globals.local
+blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 noblacklist /sbin
 noblacklist /usr/sbin
@@ -20,10 +23,13 @@ include disable-xdg.inc
 whitelist /usr/share/dnscrypt-proxy
 include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
+apparmor
 caps.keep ipc_lock,net_bind_service,setgid,setuid,sys_chroot
 ipc-namespace
 machine-id
+netfilter
 no3d
 nodbus
 nodvd
@@ -34,6 +40,8 @@ nou2f
 novideo
 protocol inet,inet6
 seccomp.drop _sysctl,acct,add_key,adjtimex,clock_adjtime,delete_module,fanotify_init,finit_module,get_mempolicy,init_module,io_cancel,io_destroy,io_getevents,io_setup,io_submit,ioperm,iopl,kcmp,kexec_file_load,kexec_load,keyctl,lookup_dcookie,mbind,migrate_pages,modify_ldt,mount,move_pages,open_by_handle_at,perf_event_open,perf_event_open,pivot_root,process_vm_readv,process_vm_writev,ptrace,remap_file_pages,request_key,set_mempolicy,swapoff,swapon,sysfs,syslog,umount2,uselib,vmsplice
+shell none
+tracelog
 disable-mnt
 private
diff --git a/etc/dnsmasq.profile b/etc/dnsmasq.profile
index dfb1b61c1..6db71bd49 100644
--- a/etc/dnsmasq.profile
+++ b/etc/dnsmasq.profile
@@ -11,6 +11,7 @@ noblacklist /sbin
 noblacklist /usr/sbin
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/easystroke.profile b/etc/easystroke.profile
index 623a4cadc..1297f5f40 100644
--- a/etc/easystroke.profile
+++ b/etc/easystroke.profile
@@ -16,7 +16,11 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
+mkdir ${HOME}/.easystroke
+whitelist ${HOME}/.easystroke
+include whitelist-common.inc
 include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
 apparmor
 caps.drop all
@@ -35,6 +39,7 @@ novideo
 protocol unix
 seccomp
 shell none
+tracelog
 disable-mnt
 # breaks custom shell command functionality
diff --git a/etc/elinks.profile b/etc/elinks.profile
index 94f4179c7..82d1ba528 100644
--- a/etc/elinks.profile
+++ b/etc/elinks.profile
@@ -9,6 +9,7 @@ include globals.local
 noblacklist ${HOME}/.elinks
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/email-common.profile b/etc/email-common.profile
new file mode 100644
index 000000000..f9d96858b
--- /dev/null
+++ b/etc/email-common.profile
@@ -0,0 +1,68 @@
+# Firejail profile for email-common
+# Description: Common profile for claws-mail and sylpheed email clients
+# This file is overwritten after every install/update
+# Persistent local customizations
+include email-common.local
+# Persistent global definitions
+# added by caller profile
+#include globals.local
+noblacklist ${HOME}/.gnupg
+noblacklist ${HOME}/.signature
+# when storing mail outside the default ${HOME}/Mail path, 'noblacklist' the custom path in your email-common.local
+# and 'blacklist' it in your disable-common.local too so it is  kept hidden from other applications
+noblacklist ${HOME}/Mail
+noblacklist ${DOCUMENTS}
+include disable-common.inc
+include disable-devel.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
+whitelist ${DOCUMENTS}
+whitelist ${DOWNLOADS}
+mkfile ${HOME}/.config/mimeapps.list
+mkdir ${HOME}/.gnupg
+mkfile ${HOME}/.signature
+whitelist ${HOME}/.config/mimeapps.list
+whitelist ${HOME}/.gnupg
+whitelist ${HOME}/.signature
+# when storing mail outside the default ${HOME}/Mail path, 'whitelist' the custom path in your email-common.local
+whitelist ${HOME}/Mail
+whitelist /usr/share/gnupg
+whitelist /usr/share/gnupg2
+include whitelist-common.inc
+include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
+caps.drop all
+netfilter
+no3d
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix,inet,inet6
+seccomp
+shell none
+tracelog
+private-cache
+private-dev
+private-tmp
+# encrypting and signing email
+read-only ${HOME}/.config/mimeapps.list
+writable-run-user
+# If you want to read local mail stored in /var/mail, add the following to email-common.local:
+# whitelist /var/mail
+# whitelist /var/spool/mail
+# writable-var
diff --git a/etc/enchant.profile b/etc/enchant.profile
index d276cec84..fa556c7d2 100644
--- a/etc/enchant.profile
+++ b/etc/enchant.profile
@@ -6,6 +6,8 @@ include enchant.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.config/enchant
 include disable-common.inc
@@ -16,7 +18,11 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
+mkdir ${HOME}/.config/enchant
+whitelist ${HOME}/.config/enchant
+include whitelist-common.inc
 include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
 apparmor
 caps.drop all
diff --git a/etc/ephemeral.profile b/etc/ephemeral.profile
index fa7746da5..c688c2324 100644
--- a/etc/ephemeral.profile
+++ b/etc/ephemeral.profile
@@ -55,7 +55,7 @@ tracelog
 disable-mnt
 private-cache
-private-dev
+?BROWSER_DISABLE_U2F: private-dev
 # private-etc below works fine on most distributions. There are some problems on CentOS.
 #private-etc alternatives,asound.conf,ca-certificates,crypto-policies,dconf,fonts,group,gtk-2.0,gtk-3.0,hostname,hosts,ld.so.cache,localtime,login.defs,machine-id,mailcap,mime.types,nsswitch.conf,os-release,pango,passwd,pki,pulse,resolv.conf,selinux,ssl,X11,xdg
 private-tmp
diff --git a/etc/et.profile b/etc/et.profile
new file mode 100644
index 000000000..4e70bb114
--- /dev/null
+++ b/etc/et.profile
@@ -0,0 +1,11 @@
+# Firejail profile for et
+# Description: WPS Office - Spreadsheets
+# This file is overwritten after every install/update
+# Persistent local customizations
+include et.local
+# Persistent global definitions
+# added by included profile
+#include globals.local
+# Redirect
+include wps.profile
diff --git a/etc/evince.profile b/etc/evince.profile
index 570d7d63d..143a347e6 100644
--- a/etc/evince.profile
+++ b/etc/evince.profile
@@ -17,6 +17,7 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
+whitelist /usr/share/doc
 whitelist /usr/share/evince
 whitelist /usr/share/poppler
 whitelist /usr/share/tracker
diff --git a/etc/exfalso.profile b/etc/exfalso.profile
index 7d91f2854..04bafdde4 100644
--- a/etc/exfalso.profile
+++ b/etc/exfalso.profile
@@ -31,6 +31,7 @@ include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
 caps.drop all
+ipc-namespace
 machine-id
 netfilter
 no3d
diff --git a/etc/exiftool.profile b/etc/exiftool.profile
index e9c7d290a..9316a0585 100644
--- a/etc/exiftool.profile
+++ b/etc/exiftool.profile
@@ -6,6 +6,8 @@ include exiftool.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 # Allow perl (blacklisted by disable-interpreters.inc)
 include allow-perl.inc
diff --git a/etc/feedreader.profile b/etc/feedreader.profile
index c12ab2399..5a72b60ea 100644
--- a/etc/feedreader.profile
+++ b/etc/feedreader.profile
@@ -40,8 +40,10 @@ novideo
 protocol unix,inet,inet6
 seccomp
 shell none
+tracelog
 disable-mnt
+private-cache
 private-dev
 private-tmp
diff --git a/etc/ffmpeg.profile b/etc/ffmpeg.profile
index 67c0ed311..b392087e8 100644
--- a/etc/ffmpeg.profile
+++ b/etc/ffmpeg.profile
@@ -47,7 +47,7 @@ tracelog
 private-bin ffmpeg
 private-cache
 private-dev
-private-etc alternatives,ca-certificates,hosts,pkcs11,pki,resolv.conf,ssl
+private-etc alternatives,ca-certificates,crypto-policies,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,nsswitch.conf,pkcs11,pki,resolv.conf,ssl
 private-tmp
 # memory-deny-write-execute - it breaks old versions of ffmpeg
diff --git a/etc/file.profile b/etc/file.profile
index 37c7ee9e7..9b21818f8 100644
--- a/etc/file.profile
+++ b/etc/file.profile
@@ -7,6 +7,8 @@ include file.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-exec.inc
 include disable-passwdmgr.inc
diff --git a/etc/firefox-common.profile b/etc/firefox-common.profile
index 7777d07ce..323070289 100644
--- a/etc/firefox-common.profile
+++ b/etc/firefox-common.profile
@@ -52,7 +52,7 @@ shell none
 #tracelog
 disable-mnt
-private-dev
+?BROWSER_DISABLE_U2F: private-dev
 # private-etc below works fine on most distributions. There are some problems on CentOS.
-#private-etc alternatives,asound.conf,ca-certificates,crypto-policies,dconf,fonts,group,gtk-2.0,gtk-3.0,hostname,hosts,ld.so.cache,localtime,machine-id,mailcap,mime.types,nsswitch.conf,pango,passwd,pki,pulse,resolv.conf,selinux,ssl,X11,xdg
+#private-etc alternatives,asound.conf,ca-certificates,crypto-policies,dconf,fonts,group,gtk-2.0,gtk-3.0,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,localtime,machine-id,mailcap,mime.types,nsswitch.conf,pango,passwd,pki,pulse,resolv.conf,selinux,ssl,X11,xdg
 private-tmp
diff --git a/etc/firefox-x11.profile b/etc/firefox-x11.profile
new file mode 100644
index 000000000..ffd64aad7
--- /dev/null
+++ b/etc/firefox-x11.profile
@@ -0,0 +1,10 @@
+# Firejail profile alias for firefox-x11
+# This file is overwritten after every install/update
+# Persistent local customizations
+include firefox-x11.local
+# Persistent global definitions
+# added by included profile
+#include globals.local
+# Redirect
+include firefox.profile
diff --git a/etc/firefox.profile b/etc/firefox.profile
index 0278c70f2..0530516d8 100644
--- a/etc/firefox.profile
+++ b/etc/firefox.profile
@@ -14,7 +14,10 @@ mkdir ${HOME}/.mozilla
 whitelist ${HOME}/.cache/mozilla/firefox
 whitelist ${HOME}/.mozilla
+whitelist /usr/share/doc
+whitelist /usr/share/gtk-doc/html
 whitelist /usr/share/mozilla
+whitelist /usr/share/webext
 include whitelist-usr-share-common.inc
 # firefox requires a shell to launch on Arch.
diff --git a/etc/firejail.config b/etc/firejail.config
index 3bff2f7ed..6fb7d829a 100644
--- a/etc/firejail.config
+++ b/etc/firejail.config
@@ -62,9 +62,9 @@
 # root user can always join sandboxes.
 # join yes
-# Timeout when joining a sandbox, default five seconds. Wait up to
+# Timeout when joining a sandbox, default five seconds. It is not
-# the specified period of time to allow sandbox setup to finish.
+# possible to join a sandbox while it is still starting up. Wait up
-# It is not possible to join a sandbox while it is still starting up.
+# to the specified period of time to allow sandbox setup to finish.
 # join-timeout 5
 # Enable or disable sandbox name change, default enabled.
diff --git a/etc/freecad.profile b/etc/freecad.profile
index 079c85fb1..6f0f52a55 100644
--- a/etc/freecad.profile
+++ b/etc/freecad.profile
@@ -9,6 +9,10 @@ include globals.local
 noblacklist ${HOME}/.config/FreeCAD
 noblacklist ${DOCUMENTS}
+# Allow python (blacklisted by disable-interpreters.inc)
+include allow-python2.inc
+include allow-python3.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
@@ -33,7 +37,7 @@ protocol unix
 seccomp
 shell none
-private-bin freecad,freecadcmd
+private-bin freecad,freecadcmd,python*
 private-cache
 private-dev
 private-tmp
diff --git a/etc/gconf-editor.profile b/etc/gconf-editor.profile
index a2c441a20..cb39174e5 100644
--- a/etc/gconf-editor.profile
+++ b/etc/gconf-editor.profile
@@ -9,7 +9,8 @@ include gconf-editor.local
 blacklist /tmp/.X11-unix
-ignore net none
+whitelist /usr/share/gconf-editor
 ignore x11 none
 # Redirect
diff --git a/etc/gconf.profile b/etc/gconf.profile
index 25145c77d..f070e6944 100644
--- a/etc/gconf.profile
+++ b/etc/gconf.profile
@@ -6,6 +6,8 @@ include gconf.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.config/gconf
 # Allow python (blacklisted by disable-interpreters.inc)
diff --git a/etc/gedit.profile b/etc/gedit.profile
index 7dd6f270e..a4471077a 100644
--- a/etc/gedit.profile
+++ b/etc/gedit.profile
@@ -42,6 +42,7 @@ tracelog
 # private-bin gedit
 private-dev
-private-lib aspell,gconv,gedit,libgspell-1.so.*,libgtksourceview-*,libpeas-gtk-1.0.so.*,libreadline.so.*,libtinfo.so.*
+# private-lib breaks python plugins, uncomment or add to your gedit.local if you don't use them.
+#private-lib aspell,gconv,gedit,libgspell-1.so.*,libgtksourceview-*,libpeas-gtk-1.0.so.*,libreadline.so.*,libtinfo.so.*
 private-tmp
diff --git a/etc/geekbench.profile b/etc/geekbench.profile
index bf9d27788..36f9f2a55 100644
--- a/etc/geekbench.profile
+++ b/etc/geekbench.profile
@@ -43,7 +43,7 @@ private-bin bash,geekbenc*,sh
 private-cache
 private-dev
 private-etc alternatives,group,lsb-release,passwd
-private-lib libstdc++.so.*
+private-lib gcc/*/*/libstdc++.so.*
 private-opt none
 private-tmp
diff --git a/etc/gfeeds.profile b/etc/gfeeds.profile
index dcb33bc38..d332c1bbe 100644
--- a/etc/gfeeds.profile
+++ b/etc/gfeeds.profile
@@ -6,6 +6,7 @@ include gfeeds.local
 # Persistent global definitions
 include globals.local
+noblacklist ${HOME}/.cache/gfeeds
 noblacklist ${HOME}/.cache/org.gabmus.gfeeds
 noblacklist ${HOME}/.config/org.gabmus.gfeeds.json
@@ -20,8 +21,10 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
+mkdir ${HOME}/.cache/gfeeds
 mkdir ${HOME}/.cache/org.gabmus.gfeeds
 mkfile ${HOME}/.config/org.gabmus.gfeeds.json
+whitelist ${HOME}/.cache/gfeeds
 whitelist ${HOME}/.cache/org.gabmus.gfeeds
 whitelist ${HOME}/.config/org.gabmus.gfeeds.json
 whitelist /usr/share/gfeeds
diff --git a/etc/gimp.profile b/etc/gimp.profile
index 5c0631eb2..57cea28f9 100644
--- a/etc/gimp.profile
+++ b/etc/gimp.profile
@@ -21,6 +21,7 @@ noblacklist ${PICTURES}
 include disable-common.inc
 include disable-exec.inc
+include disable-devel.inc
 include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
@@ -44,7 +45,7 @@ nosound
 notv
 nou2f
 protocol unix
-seccomp
+seccomp !mbind
 shell none
 tracelog
diff --git a/etc/gist.profile b/etc/gist.profile
index 7413238c8..59fcb2775 100644
--- a/etc/gist.profile
+++ b/etc/gist.profile
@@ -8,6 +8,7 @@ include gist.local
 include globals.local
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.gist
diff --git a/etc/git.profile b/etc/git.profile
index dbaaefcc4..da55f8744 100644
--- a/etc/git.profile
+++ b/etc/git.profile
@@ -20,6 +20,7 @@ noblacklist ${HOME}/.vim
 noblacklist ${HOME}/.viminfo
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-exec.inc
diff --git a/etc/gjs.profile b/etc/gjs.profile
index 871020ae0..aba020bc7 100644
--- a/etc/gjs.profile
+++ b/etc/gjs.profile
@@ -13,6 +13,9 @@ noblacklist ${HOME}/.cache/org.gnome.Books
 noblacklist ${HOME}/.config/libreoffice
 noblacklist ${HOME}/.local/share/gnome-photos
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-interpreters.inc
diff --git a/etc/gnome-books.profile b/etc/gnome-books.profile
index 25cd94f0c..84e38d0e1 100644
--- a/etc/gnome-books.profile
+++ b/etc/gnome-books.profile
@@ -10,6 +10,9 @@ include globals.local
 noblacklist ${HOME}/.cache/org.gnome.Books
 noblacklist ${DOCUMENTS}
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/gnome-characters.profile b/etc/gnome-characters.profile
index c3e9466d7..2d4724610 100644
--- a/etc/gnome-characters.profile
+++ b/etc/gnome-characters.profile
@@ -6,6 +6,9 @@ include gnome-characters.local
 # Persistent global definitions
 include globals.local
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/gnome-documents.profile b/etc/gnome-documents.profile
index 078e8c34e..705fe624e 100644
--- a/etc/gnome-documents.profile
+++ b/etc/gnome-documents.profile
@@ -11,6 +11,9 @@ include globals.local
 noblacklist ${HOME}/.config/libreoffice
 noblacklist ${DOCUMENTS}
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/gnome-maps.profile b/etc/gnome-maps.profile
index 78f5ddc3a..6540186fe 100644
--- a/etc/gnome-maps.profile
+++ b/etc/gnome-maps.profile
@@ -13,6 +13,9 @@ noblacklist ${HOME}/.cache/org.gnome.Maps
 noblacklist ${HOME}/.local/share/flatpak
 noblacklist ${HOME}/.local/share/maps-places.json
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/gnome-passwordsafe.profile b/etc/gnome-passwordsafe.profile
new file mode 100644
index 000000000..685a5cc3f
--- /dev/null
+++ b/etc/gnome-passwordsafe.profile
@@ -0,0 +1,56 @@
+# Firejail profile for gnome-passwordsafe
+# Description: Password manager for GNOME
+# This file is overwritten after every install/update
+# Persistent local customizations
+include gnome-passwordsafe.local
+# Persistent global definitions
+include globals.local
+noblacklist ${DOCUMENTS}
+noblacklist ${HOME}/*.kdb
+noblacklist ${HOME}/*.kdbx
+# Allow python (blacklisted by disable-interpreters.inc)
+include allow-python3.inc
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
+whitelist ${RUNUSER}/bus
+whitelist ${RUNUSER}/wayland-?
+whitelist ${RUNUSER}/gdm/Xauthority
+whitelist /usr/share/cracklib
+whitelist /usr/share/passwordsafe
+include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
+apparmor
+caps.drop all
+machine-id
+net none
+no3d
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix
+seccomp
+shell none
+tracelog
+disable-mnt
+private-bin gnome-passwordsafe,python3*
+private-cache
+private-dev
+private-etc dconf,fonts,gtk-3.0,passwd
+private-tmp
diff --git a/etc/gnome-sound-recorder.profile b/etc/gnome-sound-recorder.profile
index 135106c1e..7f8fc8a0c 100644
--- a/etc/gnome-sound-recorder.profile
+++ b/etc/gnome-sound-recorder.profile
@@ -10,6 +10,9 @@ noblacklist ${MUSIC}
 noblacklist ${HOME}/.local/share/flatpak
 noblacklist ${HOME}/.local/share/Trash
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/gnome-weather.profile b/etc/gnome-weather.profile
index a43db7e2f..10db6296b 100644
--- a/etc/gnome-weather.profile
+++ b/etc/gnome-weather.profile
@@ -10,6 +10,9 @@ include globals.local
 noblacklist ${HOME}/.cache/libgweather
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/gpg-agent.profile b/etc/gpg-agent.profile
index c11773147..2710ac88e 100644
--- a/etc/gpg-agent.profile
+++ b/etc/gpg-agent.profile
@@ -10,6 +10,7 @@ include globals.local
 noblacklist ${HOME}/.gnupg
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/gpg.profile b/etc/gpg.profile
index 5eb18a0bc..a60d42cf8 100644
--- a/etc/gpg.profile
+++ b/etc/gpg.profile
@@ -10,6 +10,7 @@ include globals.local
 noblacklist ${HOME}/.gnupg
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/gtk-update-icon-cache.profile b/etc/gtk-update-icon-cache.profile
index fd35a563b..668a48f9a 100644
--- a/etc/gtk-update-icon-cache.profile
+++ b/etc/gtk-update-icon-cache.profile
@@ -7,6 +7,8 @@ include gtk-update-icon-cache.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/gummi.profile b/etc/gummi.profile
new file mode 100644
index 000000000..922b2cbde
--- /dev/null
+++ b/etc/gummi.profile
@@ -0,0 +1,19 @@
+# Firejail profile for gummi
+# This file is overwritten after every install/update
+# Persistent local customizations
+include gummi.local
+# Persistent global definitions
+include globals.local
+noblacklist ${HOME}/.cache/gummi
+noblacklist ${HOME}/.config/gummi
+include allow-lua.inc
+include allow-perl.inc
+include allow-python3.inc
+private-bin dvipdf,dvips,env,gummi,latex,latexmk,lua*,lualatex,luatex,pdflatex,pdftex,perl,ps2pdf,python3*,rubber,synctex,tex,xelatex,xetex
+# Redirect
+include latex-common.profile
diff --git a/etc/gzip.profile b/etc/gzip.profile
index 48e495c60..1af15d227 100644
--- a/etc/gzip.profile
+++ b/etc/gzip.profile
@@ -7,6 +7,8 @@ include gzip.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 # Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only.
 noblacklist /var/lib/pacman
diff --git a/etc/hashcat.profile b/etc/hashcat.profile
index da59984d7..b4d6d52f0 100644
--- a/etc/hashcat.profile
+++ b/etc/hashcat.profile
@@ -7,6 +7,8 @@ include hashcat.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.hashcat
 noblacklist /usr/include
 noblacklist ${DOCUMENTS}
diff --git a/etc/hexchat.profile b/etc/hexchat.profile
index d032c93e6..7723cbd6b 100644
--- a/etc/hexchat.profile
+++ b/etc/hexchat.profile
@@ -19,6 +19,7 @@ include disable-exec.inc
 include disable-interpreters.inc
 include disable-passwdmgr.inc
 include disable-programs.inc
+include disable-xdg.inc
 mkdir ${HOME}/.config/hexchat
 whitelist ${HOME}/.config/hexchat
@@ -26,14 +27,13 @@ include whitelist-common.inc
 include whitelist-var-common.inc
 caps.drop all
-machine-id
+#machine-id -- breaks sound
 netfilter
 no3d
 nodvd
 nogroups
 nonewprivs
 noroot
-nosound
 notv
 nou2f
 novideo
diff --git a/etc/highlight.profile b/etc/highlight.profile
index 249d5cd17..036de8d99 100644
--- a/etc/highlight.profile
+++ b/etc/highlight.profile
@@ -6,6 +6,8 @@ include highlight.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-interpreters.inc
diff --git a/etc/i2prouter.profile b/etc/i2prouter.profile
index e46fb3317..9ffdb9e9b 100644
--- a/etc/i2prouter.profile
+++ b/etc/i2prouter.profile
@@ -6,19 +6,19 @@ include i2prouter.local
 # Persistent global definitions
 include globals.local
-# Notice: default browser will not be able to automatically open, due to sandbox.
+# Notice: default browser will most likely not be able to automatically open, due to sandbox.
 # Auto-opening default browser can be disabled in the I2P router console.
-# This profile will not currently work with any Arch User Repository i2p packages,
+# This profile will not currently work with any Arch User Repository I2P packages,
-# use the distro-independent official java installer instead
+# use the distro-independent official I2P java installer instead
-# Only needed if i2prouter binary is in home directory, java installer does this
+# Only needed if i2prouter binary is in home directory, official I2P java installer does this
 ignore noexec ${HOME}
 noblacklist ${HOME}/.config/i2p
 noblacklist ${HOME}/.i2p
 noblacklist ${HOME}/.local/share/i2p
 noblacklist ${HOME}/i2p
-# Only needed if wrapper is placed in /usr/sbin/, ubuntu official ppa package does this
+# Only needed if wrapper is placed in /usr/sbin/, ubuntu official I2P ppa package does this
 noblacklist /usr/sbin
 # Allow java (blacklisted by disable-devel.inc)
@@ -40,13 +40,13 @@ whitelist ${HOME}/.config/i2p
 whitelist ${HOME}/.i2p
 whitelist ${HOME}/.local/share/i2p
 whitelist ${HOME}/i2p
-# Only needed if wrapper is placed in /usr/sbin/, ubuntu official ppa package does this
+# Only needed if wrapper is placed in /usr/sbin/, ubuntu official I2P ppa package does this
 whitelist /usr/sbin/wrapper*
 include whitelist-common.inc
-# May break I2P if wrapper is placed in the home directory
+# May break I2P if wrapper is placed in the home directory; official I2P java installer does this
-# If using ubuntu official ppa, this should be fine to uncomment, as it puts wrapper in /usr/sbin/
+# If using ubuntu official I2P ppa, this should be fine to uncomment, as it puts wrapper in /usr/sbin/
 #apparmor
 caps.drop all
 ipc-namespace
@@ -67,5 +67,5 @@ shell none
 disable-mnt
 private-cache
 private-dev
-private-etc alternatives,ca-certificates,crypto-policies,i2p,java-8-openjdk,pki,ssl
+private-etc alternatives,ca-certificates,crypto-policies,dconf,group,hostname,hosts,i2p,java-10-openjdk,java-11-openjdk,java-12-openjdk,java-13-openjdk,java-8-openjdk,java-9-openjdk,java-openjdk,ld.so.cache,localtime,machine-id,nsswitch.conf,passwd,pki,resolv.conf,ssl
 private-tmp
diff --git a/etc/img2txt.profile b/etc/img2txt.profile
index c17e82870..419da765d 100644
--- a/etc/img2txt.profile
+++ b/etc/img2txt.profile
@@ -5,6 +5,8 @@ include img2txt.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${DOCUMENTS}
 noblacklist ${PICTURES}
diff --git a/etc/keepass.profile b/etc/keepass.profile
index 57a24d821..9852f8a79 100644
--- a/etc/keepass.profile
+++ b/etc/keepass.profile
@@ -34,7 +34,7 @@ nosound
 notv
 nou2f
 novideo
-protocol unix,inet,inet6
+protocol unix,inet,inet6,netlink
 seccomp
 shell none
diff --git a/etc/latex-common.profile b/etc/latex-common.profile
new file mode 100644
index 000000000..712ada722
--- /dev/null
+++ b/etc/latex-common.profile
@@ -0,0 +1,39 @@
+# Firejail profile for latex-common
+# This file is overwritten after every install/update
+# Persistent local customizations
+include latex-common.local
+# Persistent global definitions
+# added by caller profile
+#include globals.local
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+whitelist /var/lib
+include whitelist-var-common.inc
+caps.drop all
+net none
+no3d
+nodbus
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix
+seccomp
+shell none
+tracelog
+private-cache
+private-dev
+private-tmp
diff --git a/etc/latex.profile b/etc/latex.profile
new file mode 100644
index 000000000..2230dd570
--- /dev/null
+++ b/etc/latex.profile
@@ -0,0 +1,12 @@
+# Firejail profile for latex
+# This file is overwritten after every install/update
+# Persistent local customizations
+include latex.local
+# Persistent global definitions
+include globals.local
+private-bin latex
+# Redirect
+include latex-common.profile
diff --git a/etc/less.profile b/etc/less.profile
index 282b033a6..00624e0f1 100644
--- a/etc/less.profile
+++ b/etc/less.profile
@@ -7,6 +7,8 @@ include less.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.lesshst
 include disable-devel.inc
diff --git a/etc/links.profile b/etc/links.profile
index bd0b0cc92..a31001c87 100644
--- a/etc/links.profile
+++ b/etc/links.profile
@@ -9,6 +9,7 @@ include globals.local
 noblacklist ${HOME}/.links
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/lynx.profile b/etc/lynx.profile
index 063285316..fb6fe94ec 100644
--- a/etc/lynx.profile
+++ b/etc/lynx.profile
@@ -7,6 +7,7 @@ include lynx.local
 include globals.local
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/mediainfo.profile b/etc/mediainfo.profile
index 00730c00b..fb8db3e3d 100644
--- a/etc/mediainfo.profile
+++ b/etc/mediainfo.profile
@@ -6,6 +6,8 @@ include mediainfo.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/meld.profile b/etc/meld.profile
index 22ec2b999..f360b1ded 100644
--- a/etc/meld.profile
+++ b/etc/meld.profile
@@ -22,8 +22,8 @@ noblacklist ${HOME}/.ssh
 noblacklist ${HOME}/.subversion
 # Allow python (blacklisted by disable-interpreters.inc)
-include allow-python2.inc
+# Python 2 is EOL (see #3164). Uncomment the next line (or put it into your meld.local) if you understand the risks but want python 2 support for older meld versions.
-include allow-python3.inc
+#include allow-python3.inc
 # Uncomment the next line (or put it into your meld.local) if you don't need to compare files in disable-common.inc.
 #include disable-common.inc
diff --git a/etc/midori.profile b/etc/midori.profile
index ffae4919f..e11e2acaa 100644
--- a/etc/midori.profile
+++ b/etc/midori.profile
@@ -9,6 +9,7 @@ include globals.local
 # noexec ${HOME} breaks DRM binaries.
 ?BROWSER_ALLOW_DRM: ignore noexec ${HOME}
+noblacklist ${HOME}/.cache/midori
 noblacklist ${HOME}/.config/midori
 noblacklist ${HOME}/.local/share/midori
 # noblacklist ${HOME}/.local/share/webkit
@@ -16,11 +17,17 @@ noblacklist ${HOME}/.local/share/midori
 noblacklist ${HOME}/.pki
 noblacklist ${HOME}/.local/share/pki
+noblacklist ${HOME}/.cache/gnome-mplayer
+noblacklist ${HOME}/.config/gnome-mplayer
+noblacklist ${HOME}/.lastpass
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
+#include disable-passwdmgr.inc
 include disable-programs.inc
+include disable-xdg.inc
 mkdir ${HOME}/.cache/midori
 mkdir ${HOME}/.config/midori
diff --git a/etc/mp3splt.profile b/etc/mp3splt.profile
index 95173a890..7754d276b 100644
--- a/etc/mp3splt.profile
+++ b/etc/mp3splt.profile
@@ -6,6 +6,8 @@ include mp3splt.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${MUSIC}
 include disable-common.inc
diff --git a/etc/multimc.profile b/etc/multimc.profile
new file mode 100644
index 000000000..338f494c9
--- /dev/null
+++ b/etc/multimc.profile
@@ -0,0 +1,5 @@
+# Firejail profile alias for multimc5
+# This file is overwritten after every install/update
+# Redirect
+include multimc5.profile
diff --git a/etc/musescore.profile b/etc/musescore.profile
index 9750a31f4..b3693c956 100644
--- a/etc/musescore.profile
+++ b/etc/musescore.profile
@@ -33,7 +33,8 @@ noroot
 notv
 novideo
 protocol unix,inet,inet6
-seccomp
+# QtWebengine needs chroot to set up its own sandbox
+seccomp !chroot
 shell none
 tracelog
diff --git a/etc/mutt.profile b/etc/mutt.profile
index 92babd50f..1fc412955 100644
--- a/etc/mutt.profile
+++ b/etc/mutt.profile
@@ -32,6 +32,7 @@ noblacklist ${HOME}/postponed
 noblacklist ${HOME}/sent
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/nano.profile b/etc/nano.profile
index af6fcc3fe..bc8c3dde0 100644
--- a/etc/nano.profile
+++ b/etc/nano.profile
@@ -7,6 +7,8 @@ include nano.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.config/nano
 noblacklist ${HOME}/.nanorc
diff --git a/etc/ncdu.profile b/etc/ncdu.profile
index 0d7915839..9fda6ebe0 100644
--- a/etc/ncdu.profile
+++ b/etc/ncdu.profile
@@ -6,6 +6,8 @@ include ncdu.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-exec.inc
 caps.drop all
diff --git a/etc/odt2txt.profile b/etc/odt2txt.profile
index 719753c87..c0c5b671c 100644
--- a/etc/odt2txt.profile
+++ b/etc/odt2txt.profile
@@ -6,6 +6,8 @@ include odt2txt.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${DOCUMENTS}
 include disable-common.inc
diff --git a/etc/pandoc.profile b/etc/pandoc.profile
index 57b5d7e39..9a8d82a96 100644
--- a/etc/pandoc.profile
+++ b/etc/pandoc.profile
@@ -7,6 +7,8 @@ include pandoc.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${DOCUMENTS}
 include disable-common.inc
diff --git a/etc/patch.profile b/etc/patch.profile
index 03f5a4b71..4a3365378 100644
--- a/etc/patch.profile
+++ b/etc/patch.profile
@@ -7,6 +7,8 @@ include patch.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${DOCUMENTS}
 include disable-common.inc
diff --git a/etc/pdflatex.profile b/etc/pdflatex.profile
new file mode 100644
index 000000000..caf980d4d
--- /dev/null
+++ b/etc/pdflatex.profile
@@ -0,0 +1,12 @@
+# Firejail profile for pdflatex
+# This file is overwritten after every install/update
+# Persistent local customizations
+include pdflatex.local
+# Persistent global definitions
+include globals.local
+private-bin pdflatex
+# Redirect
+include latex-common.profile
diff --git a/etc/pdftotext.profile b/etc/pdftotext.profile
index e9572d914..73ebf4615 100644
--- a/etc/pdftotext.profile
+++ b/etc/pdftotext.profile
@@ -6,6 +6,8 @@ include pdftotext.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${DOCUMENTS}
 include disable-common.inc
@@ -22,6 +24,7 @@ include whitelist-usr-share-common.inc
 include whitelist-var-common.inc
 caps.drop all
+ipc-namespace
 machine-id
 net none
 no3d
@@ -41,6 +44,7 @@ tracelog
 x11 none
 private-bin pdftotext
+private-cache
 private-dev
 private-etc alternatives
 private-tmp
diff --git a/etc/pngquant.profile b/etc/pngquant.profile
index 8c06cef1a..f9ce43c4c 100644
--- a/etc/pngquant.profile
+++ b/etc/pngquant.profile
@@ -7,6 +7,8 @@ include pngquant.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/polari.profile b/etc/polari.profile
index b9f81eece..939e2537e 100644
--- a/etc/polari.profile
+++ b/etc/polari.profile
@@ -6,6 +6,8 @@ include polari.local
 # Persistent global definitions
 include globals.local
+# Allow gjs (blacklisted by disable-interpreters.inc)
+include allow-gjs.inc
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/psi-plus.profile b/etc/psi-plus.profile
index 087f90966..16fffe517 100644
--- a/etc/psi-plus.profile
+++ b/etc/psi-plus.profile
@@ -36,10 +36,10 @@ notv
 nou2f
 novideo
 protocol unix,inet,inet6
-seccomp
+# QtWebengine needs chroot to set up its own sandbox
+seccomp !chroot
 shell none
 disable-mnt
 private-dev
 private-tmp
diff --git a/etc/quassel.profile b/etc/quassel.profile
index a78d1edcd..c65089e20 100644
--- a/etc/quassel.profile
+++ b/etc/quassel.profile
@@ -19,7 +19,8 @@ nonewprivs
 noroot
 notv
 protocol unix,inet,inet6
-seccomp
+# QtWebengine needs chroot to set up its own sandbox
+seccomp !chroot
 private-cache
 private-tmp
diff --git a/etc/rsync-download_only.profile b/etc/rsync-download_only.profile
index bda3bca92..84147f0a5 100644
--- a/etc/rsync-download_only.profile
+++ b/etc/rsync-download_only.profile
@@ -13,6 +13,7 @@ include globals.local
 # Usage: firejail --profile=rsync-download_only rsync
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/rtv.profile b/etc/rtv.profile
new file mode 100644
index 000000000..af4b7e94b
--- /dev/null
+++ b/etc/rtv.profile
@@ -0,0 +1,56 @@
+# Firejail profile for rtv
+# Description: Browse Reddit from your terminal
+# This file is overwritten after every install/update
+# Persistent local customizations
+include rtv.local
+# Persistent global definitions
+include globals.local
+blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
+noblacklist ${HOME}/.config/rtv
+noblacklist ${HOME}/.local/share/rtv
+# Allow python (blacklisted by disable-interpreters.inc)
+include allow-python2.inc
+include allow-python3.inc
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
+mkdir ${HOME}/.config/rtv
+mkdir ${HOME}/.local/share/rtv
+whitelist ${HOME}/.config/rtv
+whitelist ${HOME}/.local/share/rtv
+include whitelist-var-common.inc
+apparmor
+caps.drop all
+machine-id
+netfilter
+no3d
+nodbus
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix,inet,inet6
+seccomp
+shell none
+tracelog
+disable-mnt
+private-bin python*,rtv,sh,xdg-settings
+private-cache
+private-dev
+private-etc alternatives,ca-certificates,crypto-policies,host.conf,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,mime.types,nsswitch.conf,pki,protocols,resolv.conf,rpc,services,ssl,terminfo,xdg
diff --git a/etc/server.profile b/etc/server.profile
index 6e077ff84..ce318a828 100644
--- a/etc/server.profile
+++ b/etc/server.profile
@@ -14,6 +14,7 @@ noblacklist /usr/sbin
 # noblacklist /var/opt
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 # include disable-devel.inc
diff --git a/etc/shellcheck.profile b/etc/shellcheck.profile
index d26096c77..f8744bdf8 100644
--- a/etc/shellcheck.profile
+++ b/etc/shellcheck.profile
@@ -7,6 +7,8 @@ include shellcheck.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${DOCUMENTS}
 include disable-common.inc
diff --git a/etc/shotcut.profile b/etc/shotcut.profile
index 5b3c5439d..072cc2c0d 100644
--- a/etc/shotcut.profile
+++ b/etc/shotcut.profile
@@ -29,6 +29,7 @@ nou2f
 protocol unix
 seccomp
 shell none
+tracelog
 #private-bin melt,nice,qmelt,shotcut
 private-cache
diff --git a/etc/signal-cli.profile b/etc/signal-cli.profile
index bb1bf732d..6a2f5c434 100644
--- a/etc/signal-cli.profile
+++ b/etc/signal-cli.profile
@@ -7,6 +7,7 @@ include signal-cli.local
 include globals.local
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${HOME}/.local/share/signal-cli
diff --git a/etc/spectre-meltdown-checker.profile b/etc/spectre-meltdown-checker.profile
index 3306181e4..e27df4cc8 100644
--- a/etc/spectre-meltdown-checker.profile
+++ b/etc/spectre-meltdown-checker.profile
@@ -6,6 +6,8 @@ include spectre-meltdown-checker.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 noblacklist ${PATH}/mount
 noblacklist ${PATH}/umount
diff --git a/etc/ssh-agent.profile b/etc/ssh-agent.profile
index 8e355a176..cf509852a 100644
--- a/etc/ssh-agent.profile
+++ b/etc/ssh-agent.profile
@@ -11,6 +11,7 @@ noblacklist /tmp/ssh-*
 noblacklist ${HOME}/.ssh
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-passwdmgr.inc
diff --git a/etc/standardnotes-desktop.profile b/etc/standardnotes-desktop.profile
index aa6902854..a402aca5a 100644
--- a/etc/standardnotes-desktop.profile
+++ b/etc/standardnotes-desktop.profile
@@ -39,5 +39,5 @@ seccomp !chroot
 disable-mnt
 private-dev
 private-tmp
-private-etc alternatives,ca-certificates,crypto-policies,fonts,host.conf,hostname,hosts,pki,resolv.conf,ssl,xdg
+private-etc alternatives,ca-certificates,crypto-policies,fonts,host.conf,hostname,hosts,ld.so.cache,pki,resolv.conf,ssl,xdg
diff --git a/etc/start-tor-browser.profile b/etc/start-tor-browser.profile
index a8b5d109e..f9daf8f09 100644
--- a/etc/start-tor-browser.profile
+++ b/etc/start-tor-browser.profile
@@ -36,5 +36,5 @@ shell none
 disable-mnt
 private-bin bash,cat,cp,cut,dirname,env,getconf,gpg,grep,gxmessage,id,kdialog,ln,mkdir,pwd,readlink,realpath,rm,sed,sh,tail,test,update-desktop-database,xmessage,zenity
 private-dev
-private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,hostname,hosts,ld.so.cache,machine-id,pki,pulse,resolv.conf,ssl
+private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,hostname,hosts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,machine-id,pki,pulse,resolv.conf,ssl
 private-tmp
diff --git a/etc/strings.profile b/etc/strings.profile
index 52b762108..7dc453b1f 100644
--- a/etc/strings.profile
+++ b/etc/strings.profile
@@ -7,6 +7,8 @@ include strings.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 #include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/sylpheed.profile b/etc/sylpheed.profile
index 8e99fe1d6..4344fe73a 100644
--- a/etc/sylpheed.profile
+++ b/etc/sylpheed.profile
@@ -4,17 +4,14 @@
 # Persistent local customizations
 include sylpheed.local
 # Persistent global definitions
-# added by included profile
+include globals.local
-#include globals.local
 noblacklist ${HOME}/.sylpheed-2.0
-# when storing mail outside the default ${HOME}/Mail path, 'noblacklist' the custom path in your sylpheed.local
-# and 'blacklist' it in your disable-common.local too so it is  kept hidden from other applications
-blacklist ${HOME}/.claws-mail
+mkdir ${HOME}/.sylpheed-2.0
+whitelist ${HOME}/.sylpheed-2.0
-nowhitelist /usr/share/doc/claws-mail
 whitelist /usr/share/sylpheed
 # Redirect
-include claws-mail.profile
+include email-common.profile
diff --git a/etc/tar.profile b/etc/tar.profile
index 455a370de..0858dcb26 100644
--- a/etc/tar.profile
+++ b/etc/tar.profile
@@ -7,6 +7,8 @@ include tar.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 # Arch Linux (based distributions) need access to /var/lib/pacman. As we drop all capabilities this is automatically read-only.
 noblacklist /var/lib/pacman
diff --git a/etc/teams-for-linux.profile b/etc/teams-for-linux.profile
index d9e874be2..882d8d0f3 100644
--- a/etc/teams-for-linux.profile
+++ b/etc/teams-for-linux.profile
@@ -1,37 +1,27 @@
 # Firejail profile for teams-for-linux
-# Description: Teams for Linux is an Electron application for Microsoft's team collaboration and chat program
+# Description: Unofficial Microsoft Teams client for Linux using Electron.
 # This file is overwritten after every install/update
 # Persistent local customizations
 include teams-for-linux.local
 # Persistent global definitions
-include globals.local
+# added by included profile
+#include globals.local
+ignore nodbus
 noblacklist ${HOME}/.config/teams-for-linux
-include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
-include disable-passwdmgr.inc
-include disable-programs.inc
 mkdir ${HOME}/.config/teams-for-linux
 whitelist ${HOME}/.config/teams-for-linux
-whitelist ${DOWNLOADS}
 include whitelist-common.inc
 include whitelist-var-common.inc
-caps.drop all
-netfilter
-nodvd
-nogroups
-nonewprivs
-noroot
-notv
 nou2f
 novideo
-protocol unix,inet,inet6,netlink
-seccomp
 shell none
 disable-mnt
@@ -40,3 +30,6 @@ private-cache
 private-dev
 private-etc ca-certificates,crypto-policies,fonts,ld.so.cache,localtime,machine-id,pki,resolv.conf,ssl
 private-tmp
+# Redirect
+include electron.profile
diff --git a/etc/templates/profile.template b/etc/templates/profile.template
index 7bfc3cf0d..0362b82af 100644
--- a/etc/templates/profile.template
+++ b/etc/templates/profile.template
@@ -42,6 +42,7 @@
 #  ${HOME} (user's home)
 #  ${PATH} (contents of PATH envvar)
 #  ${MUSIC}
+#  ${RUNUSER} (/run/user/UID)
 #  ${VIDEOS}
 #
 # Check contents of ~/.config/user-dirs.dirs to see how they translate to actual paths.
@@ -59,6 +60,8 @@ include globals.local
 ##blacklist PATH
 # Disable X11 (CLI only), see also 'x11 none' below
 #blacklist /tmp/.X11-unix
+# Disable Wayland
+#blacklist ${RUNUSER}/wayland-*
 # It is common practice to add files/dirs containing program-specific configuration
 # (often ${HOME}/PROGRAMNAME or ${HOME}/.config/PROGRAMNAME) into disable-programs.inc
@@ -90,6 +93,9 @@ include globals.local
 # Allow ruby (blacklisted by disable-interpreters.inc)
 #include allow-ruby.inc
+# Allow gjs (blacklisted by disable-interpreters.inc)
+#include allow-gjs.inc
 # Allows files commonly used by IDEs
 #include allow-common-devel.inc
diff --git a/etc/tex.profile b/etc/tex.profile
new file mode 100644
index 000000000..f56c3038e
--- /dev/null
+++ b/etc/tex.profile
@@ -0,0 +1,12 @@
+# Firejail profile for tex
+# This file is overwritten after every install/update
+# Persistent local customizations
+include tex.local
+# Persistent global definitions
+include globals.local
+private-bin tex
+# Redirect
+include latex-common.profile
diff --git a/etc/thunderbird.profile b/etc/thunderbird.profile
index e30b57498..6e888c163 100644
--- a/etc/thunderbird.profile
+++ b/etc/thunderbird.profile
@@ -6,13 +6,16 @@ include thunderbird.local
 # Persistent global definitions
 include globals.local
-# Users have thunderbird set to open a browser by clicking a link in an email
+# writable-run-user and dbus are needed by enigmail
-# We are not allowed to blacklist browser-specific directories
+ignore nodbus
+writable-run-user
-noblacklist ${HOME}/.cache/thunderbird
+# If you want to read local mail stored in /var/mail, add the following to thunderbird.local:
-noblacklist ${HOME}/.gnupg
+#noblacklist /var/mail
-# noblacklist ${HOME}/.icedove
+#noblacklist /var/spool/mail
-noblacklist ${HOME}/.thunderbird
+#whitelist /var/mail
+#whitelist /var/spool/mail
+#writable-var
 # Uncomment the next 4 lines or put them in your thunderbird.local to
 # allow Firefox to load your profile when clicking a link in an email
@@ -21,6 +24,14 @@ noblacklist ${HOME}/.thunderbird
 #whitelist ${HOME}/.cache/mozilla/firefox
 #whitelist ${HOME}/.mozilla
+noblacklist ${HOME}/.cache/thunderbird
+noblacklist ${HOME}/.gnupg
+# noblacklist ${HOME}/.icedove
+noblacklist ${HOME}/.thunderbird
+include disable-passwdmgr.inc
+include disable-xdg.inc
 # If you have setup Thunderbird to archive emails to a local folder,
 # make sure you add the path to that folder to the mkdir and whitelist
 # rules below. Otherwise they will be deleted when you close Thunderbird.
@@ -34,23 +45,19 @@ whitelist ${HOME}/.gnupg
 # whitelist ${HOME}/.icedove
 whitelist ${HOME}/.thunderbird
-#whitelist /usr/share/mozilla
+whitelist /usr/share/gnupg
-#include whitelist-usr-share-common.inc
+whitelist /usr/share/mozilla
+whitelist /usr/share/webext
+include whitelist-usr-share-common.inc
+# machine-id breaks audio in browsers; enable or put it in your thunderbird.local when sound is not required
+#machine-id
+novideo
 # We need the real /tmp for data exchange when xdg-open handles email attachments on KDE
 ignore private-tmp
-# machine-id breaks audio in browsers; enable or put it in your thunderbird.local when sound is not required
-# machine-id
-read-only ${HOME}/.config/mimeapps.list
-# writable-run-user and dbus are needed by enigmail
-writable-run-user
-ignore nodbus
-# If you want to read local mail stored in /var/mail, add the following to thunderbird.local:
+read-only ${HOME}/.config/mimeapps.list
-# noblacklist /var/mail
-# noblacklist /var/spool/mail
-# writable-var
-# allow browsers
 # Redirect
 include firefox-common.profile
diff --git a/etc/torbrowser-launcher.profile b/etc/torbrowser-launcher.profile
index be03afdb5..72bdf9fa1 100644
--- a/etc/torbrowser-launcher.profile
+++ b/etc/torbrowser-launcher.profile
@@ -50,5 +50,5 @@ shell none
 disable-mnt
 private-bin bash,cat,cp,cut,dirname,env,expr,file,gpg,grep,gxmessage,id,kdialog,ln,mkdir,mv,python*,rm,sed,sh,tail,tar,tclsh,test,tor-browser,tor-browser-en,torbrowser-launcher,update-desktop-database,xmessage,xz,zenity
 private-dev
-private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,ld.so.cache,machine-id,pki,pulse,resolv.conf,ssl
+private-etc alsa,alternatives,asound.conf,ca-certificates,crypto-policies,fonts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,machine-id,pki,pulse,resolv.conf,ssl
 private-tmp
diff --git a/etc/tracker.profile b/etc/tracker.profile
index 6e107d99e..d47185b1d 100644
--- a/etc/tracker.profile
+++ b/etc/tracker.profile
@@ -9,6 +9,7 @@ include globals.local
 # Tracker is started by systemd on most systems. Therefore it is not firejailed by default
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/transmission-common.profile b/etc/transmission-common.profile
index a8b667e91..b9f49c4a4 100644
--- a/etc/transmission-common.profile
+++ b/etc/transmission-common.profile
@@ -3,6 +3,9 @@
 # This file is overwritten after every install/update
 # Persistent local customizations
 include transmission-common.local
+# Persistent global definitions
+# added by caller profile
+#include globals.local
 noblacklist ${HOME}/.cache/transmission
 noblacklist ${HOME}/.config/transmission
@@ -40,6 +43,7 @@ seccomp
 shell none
 tracelog
+private-cache
 private-dev
 private-lib
 private-tmp
diff --git a/etc/transmission-daemon.profile b/etc/transmission-daemon.profile
index f1e7fcb17..1841b8ed0 100644
--- a/etc/transmission-daemon.profile
+++ b/etc/transmission-daemon.profile
@@ -7,6 +7,8 @@ include transmission-daemon.local
 # Persistent global definitions
 include globals.local
+mkdir ${HOME}/.config/transmission-daemon
+whitelist ${HOME}/.config/transmission-daemon
 whitelist /var/lib/transmission
 caps.keep ipc_lock,net_bind_service,setgid,setuid,sys_chroot
diff --git a/etc/tvbrowser.profile b/etc/tvbrowser.profile
new file mode 100644
index 000000000..6e028b086
--- /dev/null
+++ b/etc/tvbrowser.profile
@@ -0,0 +1,51 @@
+# Firejail profile for tvbrowser
+# Description: java tv programm form tvbrowser.org
+# This file is overwritten after every install/update
+# Persistent local customizations
+include tvbrowser.local
+# Persistent global definitions
+include globals.local
+noblacklist ${HOME}/.config/tvbrowser
+noblacklist ${HOME}/.tvbrowser
+# Allow java (blacklisted by disable-devel.inc)
+include allow-java.inc
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include disable-xdg.inc
+mkdir ${HOME}/.config/tvbrowser
+mkdir ${HOME}/.tvbrowser
+whitelist ${HOME}/.config/tvbrowser
+whitelist ${HOME}/.tvbrowser
+whitelist /usr/share/tvbrowser
+include whitelist-common.inc
+include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
+caps.drop all
+netfilter
+no3d
+nodbus
+nodvd
+nogroups
+nonewprivs
+noroot
+notv
+nou2f
+novideo
+protocol unix,inet,inet6
+seccomp
+shell none
+tracelog
+disable-mnt
+private-cache
+private-dev
+private-tmp
diff --git a/etc/udiskie.profile b/etc/udiskie.profile
index f6e85d60e..265f6429d 100644
--- a/etc/udiskie.profile
+++ b/etc/udiskie.profile
@@ -31,7 +31,7 @@ notv
 nou2f
 novideo
 protocol unix
-seccomp
+seccomp !request_key
 shell none
 tracelog
diff --git a/etc/unbound.profile b/etc/unbound.profile
index 67448d766..36533a762 100644
--- a/etc/unbound.profile
+++ b/etc/unbound.profile
@@ -10,6 +10,7 @@ noblacklist /sbin
 noblacklist /usr/sbin
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/unf.profile b/etc/unf.profile
index 1f0b2aa32..b8eccf4dc 100644
--- a/etc/unf.profile
+++ b/etc/unf.profile
@@ -7,6 +7,8 @@ include unf.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
@@ -48,7 +50,7 @@ private-cache
 ?HAS_APPIMAGE: ignore private-dev
 private-dev
 private-etc alternatives
-private-lib libgcc_s.so.*
+private-lib gcc/*/*/libgcc_s.so.*
 private-tmp
 memory-deny-write-execute
diff --git a/etc/unrar.profile b/etc/unrar.profile
index 428173e7d..bf28746b0 100644
--- a/etc/unrar.profile
+++ b/etc/unrar.profile
@@ -7,6 +7,8 @@ include unrar.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/unzip.profile b/etc/unzip.profile
index 60e447049..7882f2b63 100644
--- a/etc/unzip.profile
+++ b/etc/unzip.profile
@@ -7,6 +7,8 @@ include unzip.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 # GNOME Shell integration (chrome-gnome-shell)
 noblacklist ${HOME}/.local/share/gnome-shell
diff --git a/etc/uudeview.profile b/etc/uudeview.profile
index 60a7f0d20..bd2ee01d5 100644
--- a/etc/uudeview.profile
+++ b/etc/uudeview.profile
@@ -7,6 +7,8 @@ include uudeview.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/w3m.profile b/etc/w3m.profile
index 76531d315..97465baa1 100644
--- a/etc/w3m.profile
+++ b/etc/w3m.profile
@@ -9,6 +9,7 @@ include globals.local
 noblacklist ${HOME}/.w3m
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include allow-perl.inc
diff --git a/etc/wget.profile b/etc/wget.profile
index c1f7dfc3f..401926e2d 100644
--- a/etc/wget.profile
+++ b/etc/wget.profile
@@ -12,6 +12,7 @@ noblacklist ${HOME}/.wget-hsts
 noblacklist ${HOME}/.wgetrc
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/whalebird.profile b/etc/whalebird.profile
index 26932b6b3..2e24dd8e0 100644
--- a/etc/whalebird.profile
+++ b/etc/whalebird.profile
@@ -4,37 +4,27 @@
 # Persistent local customizations
 include whalebird.local
 # Persistent global definitions
-include globals.local
+# added by included profile
+#include globals.local
+ignore nodbus
 noblacklist ${HOME}/.config/Whalebird
-include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
-include disable-passwdmgr.inc
-include disable-programs.inc
 include disable-xdg.inc
 mkdir ${HOME}/.config/Whalebird
 whitelist ${HOME}/.config/Whalebird
-whitelist ${DOWNLOADS}
 include whitelist-common.inc
 include whitelist-var-common.inc
-apparmor
-caps.drop all
-netfilter
 no3d
-nodvd
-nogroups
-nonewprivs
-noroot
-notv
 nou2f
 novideo
 protocol unix,inet,inet6
-seccomp
 shell none
 disable-mnt
@@ -43,3 +33,6 @@ private-cache
 private-dev
 private-etc fonts,machine-id
 private-tmp
+# Redirect
+include electron.profile
diff --git a/etc/whitelist-usr-share-common.inc b/etc/whitelist-usr-share-common.inc
index 322bdefe9..710007163 100644
--- a/etc/whitelist-usr-share-common.inc
+++ b/etc/whitelist-usr-share-common.inc
@@ -13,6 +13,7 @@ whitelist /usr/share/distro-info
 whitelist /usr/share/drirc.d
 whitelist /usr/share/enchant
 whitelist /usr/share/enchant-2
+whitelist /usr/share/file
 whitelist /usr/share/fontconfig
 whitelist /usr/share/fonts
 whitelist /usr/share/gir-1.0
@@ -26,6 +27,7 @@ whitelist /usr/share/gtksourceview-4
 whitelist /usr/share/hunspell
 whitelist /usr/share/hwdata
 whitelist /usr/share/icons
+whitelist /usr/share/icu
 whitelist /usr/share/knotifications5
 whitelist /usr/share/kservices5
 whitelist /usr/share/Kvantum
diff --git a/etc/whois.profile b/etc/whois.profile
index bd0870bea..0e60e18ab 100644
--- a/etc/whois.profile
+++ b/etc/whois.profile
@@ -8,6 +8,7 @@ include whois.local
 include globals.local
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
@@ -45,8 +46,8 @@ private
 private-bin bash,sh,whois
 private-cache
 private-dev
-private-etc alternatives,hosts,jwhois.conf,services,whois.conf
+private-etc alternatives,hosts,jwhois.conf,resolv.conf,services,whois.conf
-private-lib
+private-lib gconv
 private-tmp
 memory-deny-write-execute
diff --git a/etc/wire-desktop.profile b/etc/wire-desktop.profile
index 490255fa6..3c783322b 100644
--- a/etc/wire-desktop.profile
+++ b/etc/wire-desktop.profile
@@ -1,40 +1,35 @@
 # Firejail profile for wire-desktop
+# Description: End-to-end encrypted messenger with file sharing, voice calls and video conferences
 # This file is overwritten after every install/update
 # Persistent local customizations
 include wire-desktop.local
 # Persistent global definitions
-include globals.local
+# added by included profile
+#include globals.local
+# Debian/Ubuntu use /opt/Wire. As that is not in PATH by default, run `firejail /opt/Wire/wire-desktop` to start it.
+ignore caps.drop all
+ignore nodbus
 noblacklist ${HOME}/.config/Wire
-include disable-common.inc
 include disable-devel.inc
 include disable-interpreters.inc
-include disable-passwdmgr.inc
-include disable-programs.inc
 mkdir ${HOME}/.config/Wire
 whitelist ${HOME}/.config/Wire
-whitelist ${DOWNLOADS}
 include whitelist-common.inc
-caps.drop all
+caps.keep sys_admin,sys_chroot
-netfilter
-nodvd
-nogroups
-nonewprivs
-noroot
-notv
 nou2f
-protocol unix,inet,inet6,netlink
-seccomp
 shell none
-# Note: The current version of Wire is located in /opt/wire-desktop/wire-desktop, and therefore
-# it is not in PATH. To use Wire with firejail, run "firejail /opt/wire-desktop/wire-desktop"
 disable-mnt
 private-bin bash,electron,electron4,env,sh,wire-desktop
 private-dev
 private-etc alternatives,ca-certificates,crypto-policies,fonts,machine-id,pki,resolv.conf,ssl
 private-tmp
+# Redirect
+include electron.profile
diff --git a/etc/wpp.profile b/etc/wpp.profile
new file mode 100644
index 000000000..a219397a9
--- /dev/null
+++ b/etc/wpp.profile
@@ -0,0 +1,14 @@
+# Firejail profile for wpp
+# Description: WPS Office - Presentation
+# This file is overwritten after every install/update
+# Persistent local customizations
+include wpp.local
+# Persistent global definitions
+# added by included profile
+#include globals.local
+ignore machine-id
+ignore nosound
+# Redirect
+include wps.profile
diff --git a/etc/wps.profile b/etc/wps.profile
new file mode 100644
index 000000000..47bba2dda
--- /dev/null
+++ b/etc/wps.profile
@@ -0,0 +1,47 @@
+# Firejail profile for wps
+# Description: WPS Office - Writer
+# This file is overwritten after every install/update
+# Persistent local customizations
+include wps.local
+# Persistent global definitions
+include globals.local
+noblacklist ${HOME}/.kingsoft
+noblacklist ${HOME}/.config/Kingsoft
+noblacklist ${HOME}/.local/share/Kingsoft
+include disable-common.inc
+include disable-devel.inc
+include disable-exec.inc
+include disable-interpreters.inc
+include disable-passwdmgr.inc
+include disable-programs.inc
+include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
+apparmor
+caps.drop all
+machine-id
+# Uncomment the next line (or add to wps.local) if you don't use network features.
+#net none
+netfilter
+no3d
+nodbus
+nodvd
+nogroups
+nonewprivs
+noroot
+nosound
+notv
+nou2f
+novideo
+protocol unix,inet,inet6
+# seccomp cause some minor issues, if you can live with them enable it.
+#seccomp
+shell none
+tracelog
+private-cache
+private-dev
+private-tmp
diff --git a/etc/wpspdf.profile b/etc/wpspdf.profile
new file mode 100644
index 000000000..82080acbc
--- /dev/null
+++ b/etc/wpspdf.profile
@@ -0,0 +1,11 @@
+# Firejail profile for wpspdf
+# Description: Kingsoft Pdf Reader
+# This file is overwritten after every install/update
+# Persistent local customizations
+include et.local
+# Persistent global definitions
+# added by included profile
+#include globals.local
+# Redirect
+include wps.profile
diff --git a/etc/xzdec.profile b/etc/xzdec.profile
index 93c288d6e..ca6aaf1d5 100644
--- a/etc/xzdec.profile
+++ b/etc/xzdec.profile
@@ -7,6 +7,8 @@ include xzdec.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/yelp.profile b/etc/yelp.profile
index 41138cd17..acd483209 100644
--- a/etc/yelp.profile
+++ b/etc/yelp.profile
@@ -18,6 +18,7 @@ include disable-xdg.inc
 mkdir ${HOME}/.config/yelp
 whitelist ${HOME}/.config/yelp
+whitelist /usr/share/doc
 whitelist /usr/share/help
 whitelist /usr/share/yelp
 whitelist /usr/share/yelp-xsl
diff --git a/etc/youtube-dl.profile b/etc/youtube-dl.profile
index 5fa72c9dc..19effef47 100644
--- a/etc/youtube-dl.profile
+++ b/etc/youtube-dl.profile
@@ -21,6 +21,7 @@ include allow-python2.inc
 include allow-python3.inc
 blacklist /tmp/.X11-unix
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
diff --git a/etc/zathura.profile b/etc/zathura.profile
index 68a5701ee..703c8edd4 100644
--- a/etc/zathura.profile
+++ b/etc/zathura.profile
@@ -18,10 +18,18 @@ include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
+mkdir ${HOME}/.config/zathura
+mkdir ${HOME}/.local/share/zathura
+whitelist /usr/share/doc
+whitelist /usr/share/zathura
+include whitelist-usr-share-common.inc
+include whitelist-var-common.inc
 caps.drop all
+ipc-namespace
 machine-id
-# net none
+net none
-# nodbus
+nodbus
 nodvd
 nogroups
 nonewprivs
@@ -38,11 +46,10 @@ tracelog
 private-bin zathura
 private-cache
 private-dev
-private-etc alternatives,fonts,machine-id
+private-etc alternatives,fonts,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,machine-id
+private-lib gcc/*/*/libgcc_s.so.*,gcc/*/*/libstdc++.so.*,libarchive.so.*,libdjvulibre.so.*,libgirara-gtk*,libpoppler-glib.so.*,libspectre.so.*,zathura
 private-tmp
-mkdir ${HOME}/.config/zathura
-mkdir ${HOME}/.local/share/zathura
 read-only ${HOME}
 read-write ${HOME}/.config/zathura
 read-write ${HOME}/.local/share/zathura
diff --git a/etc/zstd.profile b/etc/zstd.profile
index ea7bbfb0d..93b849568 100644
--- a/etc/zstd.profile
+++ b/etc/zstd.profile
@@ -7,6 +7,8 @@ include zstd.local
 # Persistent global definitions
 include globals.local
+blacklist ${RUNUSER}/wayland-*
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/gcov.sh b/gcov.sh
index 8fb4a9a8d..ea403bf5a 100755
--- a/gcov.sh
+++ b/gcov.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 gcov_init() {
        USER=`whoami`
diff --git a/install.sh b/install.sh
index a8a506096..2fa61cc0a 100755
--- a/install.sh
+++ b/install.sh
@@ -1,2 +1,6 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 echo "installing..."
diff --git a/linecnt.sh b/linecnt.sh
index 8d77a65ee..1bf834015 100755
--- a/linecnt.sh
+++ b/linecnt.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 gcov_init() {
        USER=`whoami`
diff --git a/mkasc.sh b/mkasc.sh
index 3bbfc6eb5..872127dda 100755
--- a/mkasc.sh
+++ b/mkasc.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 echo "Calculationg SHA256 for all files in /transfer - firejail version $1"
diff --git a/mkdeb-apparmor.sh b/mkdeb-apparmor.sh
index 152165d60..3c560179c 100755
--- a/mkdeb-apparmor.sh
+++ b/mkdeb-apparmor.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 # based on http://tldp.org/HOWTO/html_single/Debian-Binary-Package-Building-HOWTO/
 # a code archive should already be available
diff --git a/mkdeb.sh b/mkdeb.sh
index 630aad51f..dd784eb8a 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 # based on http://tldp.org/HOWTO/html_single/Debian-Binary-Package-Building-HOWTO/
 # a code archive should already be available
diff --git a/mketc.sh b/mketc.sh
index 4eb29963c..8dbc72915 100755
--- a/mketc.sh
+++ b/mketc.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 rm -fr .etc
 mkdir .etc
diff --git a/mkman.sh b/mkman.sh
index e36475aad..b8e7e58eb 100755
--- a/mkman.sh
+++ b/mkman.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 sed "s/VERSION/$1/g" $2 > $3
 MONTH=`LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%b`
diff --git a/mkuid.sh b/mkuid.sh
index 9a37dc2ca..96d6fa401 100755
--- a/mkuid.sh
+++ b/mkuid.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 echo "extracting UID_MIN and GID_MIN"
 echo "#ifndef FIREJAIL_UIDS_H" > uids.h
diff --git a/platform/debian/copyright b/platform/debian/copyright
index 2c15356c4..c0f98104d 100644
--- a/platform/debian/copyright
+++ b/platform/debian/copyright
@@ -7,7 +7,7 @@ This is the Debian/Ubuntu prepackaged version of firejail.
    and networking stack isolation, and it runs on any recent Linux system. It
    includes a sandbox profile for Mozilla Firefox.
-    Copyright (C) 2014-2019 Firejail Authors (see README file for more details)
+    Copyright (C) 2014-2020 Firejail Authors (see README file for more details)
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index 351b92beb..348bea7f2 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # Usage: ./platform/rpm/mkrpm.sh firejail <version>
 #
diff --git a/src/faudit/caps.c b/src/faudit/caps.c
index 644a69b82..6687fce5a 100644
--- a/src/faudit/caps.c
+++ b/src/faudit/caps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/dbus.c b/src/faudit/dbus.c
index 2e4a7550b..8c26c5271 100644
--- a/src/faudit/dbus.c
+++ b/src/faudit/dbus.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/dev.c b/src/faudit/dev.c
index 3b5921aee..9c80f99df 100644
--- a/src/faudit/dev.c
+++ b/src/faudit/dev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/faudit.h b/src/faudit/faudit.h
index ec01dde32..20189a0ff 100644
--- a/src/faudit/faudit.h
+++ b/src/faudit/faudit.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/files.c b/src/faudit/files.c
index 33d68efbf..6dd3874b9 100644
--- a/src/faudit/files.c
+++ b/src/faudit/files.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/main.c b/src/faudit/main.c
index 06dcbece0..f6df9772d 100644
--- a/src/faudit/main.c
+++ b/src/faudit/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/network.c b/src/faudit/network.c
index 214cb972c..f28aff554 100644
--- a/src/faudit/network.c
+++ b/src/faudit/network.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/pid.c b/src/faudit/pid.c
index 6be2483ae..a45b6e31a 100644
--- a/src/faudit/pid.c
+++ b/src/faudit/pid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/seccomp.c b/src/faudit/seccomp.c
index 346b4b457..ca9d34b84 100644
--- a/src/faudit/seccomp.c
+++ b/src/faudit/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/syscall.c b/src/faudit/syscall.c
index 3cdbf7407..a8aa572a7 100644
--- a/src/faudit/syscall.c
+++ b/src/faudit/syscall.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/faudit/x11.c b/src/faudit/x11.c
index d41c3698d..5907ca761 100644
--- a/src/faudit/x11.c
+++ b/src/faudit/x11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_bin.c b/src/fbuilder/build_bin.c
index d62ec3f17..a44546699 100644
--- a/src/fbuilder/build_bin.c
+++ b/src/fbuilder/build_bin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index 4feb8d9bc..b08afb939 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c
index 1f30fe5be..8db17a942 100644
--- a/src/fbuilder/build_home.c
+++ b/src/fbuilder/build_home.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index a0f71ae03..ea9e9a4a0 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/build_seccomp.c b/src/fbuilder/build_seccomp.c
index 6fe4c56d8..041d14d0e 100644
--- a/src/fbuilder/build_seccomp.c
+++ b/src/fbuilder/build_seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/fbuilder.h b/src/fbuilder/fbuilder.h
index 66bf8c544..5c043ffec 100644
--- a/src/fbuilder/fbuilder.h
+++ b/src/fbuilder/fbuilder.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/filedb.c b/src/fbuilder/filedb.c
index 89fe72c29..bf4e911dd 100644
--- a/src/fbuilder/filedb.c
+++ b/src/fbuilder/filedb.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/main.c b/src/fbuilder/main.c
index 159af9ae8..5612c21d5 100644
--- a/src/fbuilder/main.c
+++ b/src/fbuilder/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fbuilder/utils.c b/src/fbuilder/utils.c
index c1cd05f39..2ae829403 100644
--- a/src/fbuilder/utils.c
+++ b/src/fbuilder/utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fcopy/main.c b/src/fcopy/main.c
index 00cbe8d12..5c4a76753 100644
--- a/src/fcopy/main.c
+++ b/src/fcopy/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fgit/fgit-install.sh b/src/fgit/fgit-install.sh
index 1f710c688..262b6f112 100755
--- a/src/fgit/fgit-install.sh
+++ b/src/fgit/fgit-install.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
+#
 # Purpose: Fetch, compile, and install firejail from GitHub source. Package-manager agnostic.
 #
diff --git a/src/fgit/fgit-uninstall.sh b/src/fgit/fgit-uninstall.sh
index bc7cc9563..d40f90320 100644
--- a/src/fgit/fgit-uninstall.sh
+++ b/src/fgit/fgit-uninstall.sh
@@ -1,4 +1,8 @@
 #!/bin/sh
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
+#
 # Purpose: Fetch, compile, and install firejail from GitHub source. Package-manager agnostic.
 #
diff --git a/src/firecfg/desktop_files.c b/src/firecfg/desktop_files.c
index c8f684abc..16aa638b3 100644
--- a/src/firecfg/desktop_files.c
+++ b/src/firecfg/desktop_files.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/firecfg.config b/src/firecfg/firecfg.config
index 011d6c7e1..040ad3827 100644
--- a/src/firecfg/firecfg.config
+++ b/src/firecfg/firecfg.config
@@ -122,6 +122,7 @@ clawsker
 clementine
 clion
 clipit
+clipgrab
 cliqz
 clocks
 cmus
@@ -179,6 +180,7 @@ eog
 eom
 ephemeral
 #epiphany
+et
 etr
 evince
 evince-previewer
@@ -202,6 +204,7 @@ firefox-developer-edition
 firefox-esr
 firefox-nightly
 firefox-wayland
+firefox-x11
 flacsplt
 flameshot
 flashpeak-slimjet
@@ -265,6 +268,7 @@ gnome-mplayer
 gnome-mpv
 gnome-music
 gnome-nettool
+gnome-passwordsafe
 gnome-photos
 gnome-recipes
 gnome-schedule
@@ -288,6 +292,7 @@ gramps
 gthumb
 guayadeque
 gucharmap
+gummi
 gwenview
 handbrake
 handbrake-gtk
@@ -296,7 +301,6 @@ hedgewars
 hexchat
 highlight
 hugin
-i2prouter
 icecat
 icedove
 iceweasel
@@ -427,6 +431,7 @@ ms-outlook
 ms-powerpoint
 ms-skype
 ms-word
+multimc
 multimc5
 mumble
 mupdf
@@ -642,6 +647,7 @@ tremulous
 truecraft
 tshark
 tuxguitar
+tvbrowser
 udiskie
 uefitool
 uget-gtk
@@ -683,6 +689,9 @@ wire-desktop
 wireshark
 wireshark-gtk
 wireshark-qt
+wpp
+wps
+wpspdf
 xcalc
 xchat
 xed
diff --git a/src/firecfg/firecfg.h b/src/firecfg/firecfg.h
index 71e5d625d..4dfc4194e 100644
--- a/src/firecfg/firecfg.h
+++ b/src/firecfg/firecfg.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/main.c b/src/firecfg/main.c
index 9a2efebd2..1e49a2fc7 100644
--- a/src/firecfg/main.c
+++ b/src/firecfg/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/sound.c b/src/firecfg/sound.c
index 2d38e4cfb..e7670c94c 100644
--- a/src/firecfg/sound.c
+++ b/src/firecfg/sound.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firecfg/util.c b/src/firecfg/util.c
index 23a66ba67..b46da0be3 100644
--- a/src/firecfg/util.c
+++ b/src/firecfg/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/appimage.c b/src/firejail/appimage.c
index 520960db2..6190b6f01 100644
--- a/src/firejail/appimage.c
+++ b/src/firejail/appimage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/appimage_size.c b/src/firejail/appimage_size.c
index 2868a1f88..a58f9a8ca 100644
--- a/src/firejail/appimage_size.c
+++ b/src/firejail/appimage_size.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/arp.c b/src/firejail/arp.c
index 843d00ce0..3714af9a3 100644
--- a/src/firejail/arp.c
+++ b/src/firejail/arp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/bandwidth.c b/src/firejail/bandwidth.c
index 30f387765..edef823fd 100644
--- a/src/firejail/bandwidth.c
+++ b/src/firejail/bandwidth.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/caps.c b/src/firejail/caps.c
index 738675766..b89e3009a 100644
--- a/src/firejail/caps.c
+++ b/src/firejail/caps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/cgroup.c b/src/firejail/cgroup.c
index 21eee6b45..30cd96c42 100644
--- a/src/firejail/cgroup.c
+++ b/src/firejail/cgroup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index d6b591133..fbe150b34 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/chroot.c b/src/firejail/chroot.c
index ec5363ced..cae52e20b 100644
--- a/src/firejail/chroot.c
+++ b/src/firejail/chroot.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c
index 134000a3d..91279a977 100644
--- a/src/firejail/cmdline.c
+++ b/src/firejail/cmdline.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/cpu.c b/src/firejail/cpu.c
index 702186eaf..66fa9fadf 100644
--- a/src/firejail/cpu.c
+++ b/src/firejail/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/dbus.c b/src/firejail/dbus.c
index b856ff809..7acbd338c 100644
--- a/src/firejail/dbus.c
+++ b/src/firejail/dbus.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/dhcp.c b/src/firejail/dhcp.c
new file mode 100644
index 000000000..7593a47f2
--- /dev/null
+++ b/src/firejail/dhcp.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2014-2020 Firejail Authors
+ *
+ * This file is part of firejail project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+#include "firejail.h"
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <errno.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+pid_t dhclient4_pid = 0;
+pid_t dhclient6_pid = 0;
+typedef struct {
+        char *version_arg;
+        char *pid_file;
+        char *leases_file;
+        uint8_t generate_duid;
+        char *duid_leases_file;
+        pid_t *pid;
+        ptrdiff_t arg_offset;
+} Dhclient;
+static const Dhclient dhclient4 = {
+        .version_arg = "-4",
+        .pid_file = RUN_DHCLIENT_4_PID_FILE,
+        .leases_file = RUN_DHCLIENT_4_LEASES_FILE,
+        .generate_duid = 1,
+        .pid = &dhclient4_pid,
+        .arg_offset = offsetof(Bridge, arg_ip_dhcp)
+};
+static const Dhclient dhclient6 = {
+        .version_arg = "-6",
+        .pid_file = RUN_DHCLIENT_6_PID_FILE,
+        .leases_file = RUN_DHCLIENT_6_LEASES_FILE,
+        .duid_leases_file = RUN_DHCLIENT_4_LEASES_FILE,
+        .pid = &dhclient6_pid,
+        .arg_offset = offsetof(Bridge, arg_ip6_dhcp)
+};
+static void dhcp_run_dhclient(const Dhclient *client) {
+        char *argv[256] = {
+                "dhclient",
+                client->version_arg,
+                "-pf", client->pid_file,
+                "-lf", client->leases_file,
+        };
+        int i = 6;
+        if (client->generate_duid)
+                argv[i++] = "-i";
+        if (client->duid_leases_file) {
+                argv[i++] = "-df";
+                argv[i++] = client->duid_leases_file;
+        }
+        if (arg_debug)
+                argv[i++] = "-v";
+        if (*(uint8_t *)((char *)&cfg.bridge0 + client->arg_offset))
+                argv[i++] = cfg.bridge0.devsandbox;
+        if (*(uint8_t *)((char *)&cfg.bridge1 + client->arg_offset))
+                argv[i++] = cfg.bridge1.devsandbox;
+        if (*(uint8_t *)((char *)&cfg.bridge2 + client->arg_offset))
+                argv[i++] = cfg.bridge2.devsandbox;
+        if (*(uint8_t *)((char *)&cfg.bridge3 + client->arg_offset))
+                argv[i++] = cfg.bridge3.devsandbox;
+        sbox_run_v(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_CAPS_NET_SERVICE | SBOX_SECCOMP, argv);
+}
+static pid_t dhcp_read_pidfile(const Dhclient *client) {
+        // We have to run dhclient as a forking daemon (not pass the -d option),
+        // because we want to be notified of a successful DHCP lease by the parent process exit.
+        // However, try to be extra paranoid with race conditions,
+        // because dhclient only writes the daemon pid into the pidfile
+        // after its parent process has exited.
+        int tries = 0;
+        pid_t found = 0;
+        while (found == 0 && tries < 10) {
+                if (tries >= 1)
+                        usleep(100000);
+                FILE *pidfile = fopen(client->pid_file, "r");
+                if (pidfile) {
+                        long pid;
+                        if (fscanf(pidfile, "%ld", &pid) == 1) {
+                                char *pidname = pid_proc_comm((pid_t) pid);
+                                if (pidname && strcmp(pidname, "dhclient") == 0)
+                                        found = (pid_t) pid;
+                        }
+                        fclose(pidfile);
+                }
+                ++tries;
+        }
+        if (found == 0) {
+                fprintf(stderr, "Error: Cannot get dhclient %s PID from %s\n",
+                                                client->version_arg, client->pid_file);
+                exit(1);
+        }
+        return found;
+}
+static void dhcp_start_dhclient(const Dhclient *client) {
+        dhcp_run_dhclient(client);
+        *(client->pid) = dhcp_read_pidfile(client);
+}
+static void dhcp_waitll(const char *ifname) {
+        sbox_run(SBOX_ROOT | SBOX_CAPS_NETWORK | SBOX_SECCOMP, 3, PATH_FNET, "waitll", ifname);
+}
+static void dhcp_waitll_all() {
+        if (cfg.bridge0.arg_ip6_dhcp)
+                dhcp_waitll(cfg.bridge0.devsandbox);
+        if (cfg.bridge1.arg_ip6_dhcp)
+                dhcp_waitll(cfg.bridge1.devsandbox);
+        if (cfg.bridge2.arg_ip6_dhcp)
+                dhcp_waitll(cfg.bridge2.devsandbox);
+        if (cfg.bridge3.arg_ip6_dhcp)
+                dhcp_waitll(cfg.bridge3.devsandbox);
+}
+void dhcp_start(void) {
+        if (!any_dhcp())
+                return;
+        EUID_ROOT();
+        if (mkdir(RUN_DHCLIENT_DIR, 0700))
+                errExit("mkdir");
+        if (any_ip_dhcp()) {
+                dhcp_start_dhclient(&dhclient4);
+                if (arg_debug)
+                        printf("Running dhclient -4 in the background as pid %ld\n", (long) dhclient4_pid);
+        }
+        if (any_ip6_dhcp()) {
+                dhcp_waitll_all();
+                dhcp_start_dhclient(&dhclient6);
+                if (arg_debug)
+                        printf("Running dhclient -6 in the background as pid %ld\n", (long) dhclient6_pid);
+                if (dhclient4_pid == dhclient6_pid) {
+                        fprintf(stderr, "Error: dhclient -4 and -6 have the same PID: %ld\n", (long) dhclient4_pid);
+                        exit(1);
+                }
+        }
+}
diff --git a/src/firejail/env.c b/src/firejail/env.c
index f15e1362f..a8b344544 100644
--- a/src/firejail/env.c
+++ b/src/firejail/env.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index 03bcbda46..4dc580a5e 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -103,6 +103,8 @@ typedef struct bridge_t {
        // flags
        uint8_t arg_ip_none;    // --ip=none
+        uint8_t arg_ip_dhcp;
+        uint8_t arg_ip6_dhcp;
        uint8_t macvlan;        // set by --net=eth0 (or eth1, ...); reset by --net=br0 (or br1, ...)
        uint8_t configured;
        uint8_t scan;           // set by --scan
@@ -237,6 +239,24 @@ static inline int any_interface_configured(void) {
                return 0;
 }
+static inline int any_ip_dhcp(void) {
+        if (cfg.bridge0.arg_ip_dhcp || cfg.bridge1.arg_ip_dhcp || cfg.bridge2.arg_ip_dhcp || cfg.bridge3.arg_ip_dhcp)
+                return 1;
+        else
+                return 0;
+}
+static inline int any_ip6_dhcp(void) {
+        if (cfg.bridge0.arg_ip6_dhcp || cfg.bridge1.arg_ip6_dhcp || cfg.bridge2.arg_ip6_dhcp || cfg.bridge3.arg_ip6_dhcp)
+                return 1;
+        else
+                return 0;
+}
+static inline int any_dhcp(void) {
+  return any_ip_dhcp() || any_ip6_dhcp();
+}
 extern int arg_private;         // mount private /home
 extern int arg_private_cache;   // private home/.cache
 extern int arg_debug;           // print debug messages
@@ -792,9 +812,11 @@ void build_appimage_cmdline(char **command_line, char **window_title, int argc,
 #define SBOX_ALLOW_STDIN (1 << 5)               // don't close stdin
 #define SBOX_STDIN_FROM_FILE (1 << 6)   // open file and redirect it to stdin
 #define SBOX_CAPS_HIDEPID (1 << 7)      // hidepid caps filter for running firemon
+#define SBOX_CAPS_NET_SERVICE (1 << 8) // caps filter for programs running network services
 // run sbox
 int sbox_run(unsigned filter, int num, ...);
+int sbox_run_v(unsigned filter, char * const arg[]);
 // run_files.c
 void delete_run_files(pid_t pid);
@@ -806,4 +828,9 @@ void set_profile_run_file(pid_t pid, const char *fname);
 // dbus.c
 void dbus_disable(void);
+// dhcp.c
+extern pid_t dhclient4_pid;
+extern pid_t dhclient6_pid;
+void dhcp_start(void);
 #endif
diff --git a/src/firejail/fs.c b/src/firejail/fs.c
index 316057ec5..c7dd91b06 100644
--- a/src/firejail/fs.c
+++ b/src/firejail/fs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -521,12 +521,16 @@ void fs_remount(const char *dir, OPERATION op, unsigned check_mnt) {
                if (mount(dir, dir, NULL, MS_BIND|MS_REC, NULL) < 0 ||
                    mount(NULL, dir, NULL, flags|MS_BIND|MS_REMOUNT, NULL) < 0)
                        errExit("remounting");
+                // run a sanity check on /proc/self/mountinfo
                if (check_mnt) {
-                        // run a sanity check on /proc/self/mountinfo
+                        // confirm target of the last mount operation was dir; if there are other
+                        // mount points contained inside dir, one of those will show up as target
+                        // of the last mount operation instead
                        MountData *mptr = get_last_mount();
                        size_t len = strlen(dir);
-                        if (strncmp(mptr->dir, dir, len) != 0 ||
+                        if ((strncmp(mptr->dir, dir, len) != 0 ||
                           (*(mptr->dir + len) != '\0' && *(mptr->dir + len) != '/'))
+                           && strcmp(dir, "/") != 0) // support read-only=/
                                errLogExit("invalid %s mount", opstr[op]);
                }
                fs_logger2(opstr[op], dir);
diff --git a/src/firejail/fs_bin.c b/src/firejail/fs_bin.c
index 17db45bf1..7150fd3eb 100644
--- a/src/firejail/fs_bin.c
+++ b/src/firejail/fs_bin.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -185,12 +185,12 @@ static void duplicate(char *fname) {
        // add to private-lib list
        if (cfg.bin_private_lib == NULL) {
                if (asprintf(&cfg.bin_private_lib, "%s,%s",fname, full_path) == -1)
-                        errExit("asprinf");
+                        errExit("asprintf");
        }
        else {
                char *tmp;
                if (asprintf(&tmp, "%s,%s,%s", cfg.bin_private_lib, fname, full_path) == -1)
-                        errExit("asprinf");
+                        errExit("asprintf");
                free(cfg.bin_private_lib);
                cfg.bin_private_lib = tmp;
        }
diff --git a/src/firejail/fs_dev.c b/src/firejail/fs_dev.c
index d807f527d..63911ab9e 100644
--- a/src/firejail/fs_dev.c
+++ b/src/firejail/fs_dev.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_etc.c b/src/firejail/fs_etc.c
index 082f8b4a0..26e010d0d 100644
--- a/src/firejail/fs_etc.c
+++ b/src/firejail/fs_etc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_home.c b/src/firejail/fs_home.c
index cfa0af078..bdfaba480 100644
--- a/src/firejail/fs_home.c
+++ b/src/firejail/fs_home.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_hostname.c b/src/firejail/fs_hostname.c
index 9da01b24c..fd5e1bbd3 100644
--- a/src/firejail/fs_hostname.c
+++ b/src/firejail/fs_hostname.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -89,7 +89,7 @@ errexit:
 }
 void fs_resolvconf(void) {
-        if (cfg.dns1 == NULL)
+        if (cfg.dns1 == NULL && !any_dhcp())
                return;
        if (arg_debug)
@@ -108,7 +108,8 @@ void fs_resolvconf(void) {
                if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0)
                        continue;
                // for resolv.conf we create a brand new file
-                if (strcmp(entry->d_name, "resolv.conf") == 0)
+                if (strcmp(entry->d_name, "resolv.conf") == 0 ||
+        strcmp(entry->d_name, "resolv.conf.dhclient-new") == 0)
                        continue;
 //              printf("linking %s\n", entry->d_name);
@@ -169,8 +170,11 @@ void fs_resolvconf(void) {
                exit(1);
        }
-        if (cfg.dns1)
+        if (cfg.dns1) {
+                if (any_dhcp())
+                        fwarning("network setup uses DHCP, nameservers will likely be overwritten\n");
                fprintf(fp, "nameserver %s\n", cfg.dns1);
+        }
        if (cfg.dns2)
                fprintf(fp, "nameserver %s\n", cfg.dns2);
        if (cfg.dns3)
diff --git a/src/firejail/fs_lib.c b/src/firejail/fs_lib.c
index 70c6ac88a..c539ce83c 100644
--- a/src/firejail/fs_lib.c
+++ b/src/firejail/fs_lib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_lib2.c b/src/firejail/fs_lib2.c
index 9923190b5..2982c4cbb 100644
--- a/src/firejail/fs_lib2.c
+++ b/src/firejail/fs_lib2.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_logger.c b/src/firejail/fs_logger.c
index 31e0147ca..892c91e3f 100644
--- a/src/firejail/fs_logger.c
+++ b/src/firejail/fs_logger.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_mkdir.c b/src/firejail/fs_mkdir.c
index 09e5c3200..eb660df90 100644
--- a/src/firejail/fs_mkdir.c
+++ b/src/firejail/fs_mkdir.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_trace.c b/src/firejail/fs_trace.c
index c1b821cce..1894784a8 100644
--- a/src/firejail/fs_trace.c
+++ b/src/firejail/fs_trace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_var.c b/src/firejail/fs_var.c
index 75369b47c..303d6f9aa 100644
--- a/src/firejail/fs_var.c
+++ b/src/firejail/fs_var.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/fs_whitelist.c b/src/firejail/fs_whitelist.c
index d2ea495ed..be5bcc4c0 100644
--- a/src/firejail/fs_whitelist.c
+++ b/src/firejail/fs_whitelist.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 1494c782f..531f8c06a 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -322,8 +322,8 @@ bool is_ready_for_join(const pid_t pid) {
 void check_join_permission(pid_t pid) {
        // check if pid belongs to a fully set up firejail sandbox
        unsigned long i;
-        for (i = 0; is_ready_for_join(pid) == false; i += SNOOZE) { // give sandbox some time to start up
+        for (i = SNOOZE; is_ready_for_join(pid) == false; i += SNOOZE) { // give sandbox some time to start up
-                if (i >= join_timeout) {
+                if (i > join_timeout) {
                        fprintf(stderr, "Error: no valid sandbox\n");
                        exit(1);
                }
@@ -531,6 +531,7 @@ void join(pid_t pid, int argc, char **argv, int index) {
                // it will never get here!!!
        }
+        EUID_USER();
        int status = 0;
        //*****************************
diff --git a/src/firejail/ls.c b/src/firejail/ls.c
index 75333fdc2..aa33d838b 100644
--- a/src/firejail/ls.c
+++ b/src/firejail/ls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/macros.c b/src/firejail/macros.c
index ef64178b5..6901b7d44 100644
--- a/src/firejail/macros.c
+++ b/src/firejail/macros.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 179f8ddf9..78717ab41 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -2144,7 +2144,10 @@ int main(int argc, char **argv) {
                                // configure this IP address for the last bridge defined
                                if (strcmp(argv[i] + 5, "none") == 0)
                                        br->arg_ip_none = 1;
-                                else {
+                                else if (strcmp(argv[i] + 5, "dhcp") == 0) {
+                                        br->arg_ip_none = 1;
+                                        br->arg_ip_dhcp = 1;
+                                } else {
                                        if (atoip(argv[i] + 5, &br->ipsandbox)) {
                                                fprintf(stderr, "Error: invalid IP address\n");
                                                exit(1);
@@ -2184,20 +2187,24 @@ int main(int argc, char **argv) {
                                        fprintf(stderr, "Error: no network device configured\n");
                                        exit(1);
                                }
-                                if (br->ip6sandbox) {
+                                if (br->arg_ip6_dhcp || br->ip6sandbox) {
                                        fprintf(stderr, "Error: cannot configure the IP address twice for the same interface\n");
                                        exit(1);
                                }
                                // configure this IP address for the last bridge defined
-                                if (check_ip46_address(argv[i] + 6) == 0) {
+                                if (strcmp(argv[i] + 6, "dhcp") == 0)
-                                        fprintf(stderr, "Error: invalid IPv6 address\n");
+                                        br->arg_ip6_dhcp = 1;
-                                        exit(1);
+                                else {
-                                }
+                                        if (check_ip46_address(argv[i] + 6) == 0) {
+                                                fprintf(stderr, "Error: invalid IPv6 address\n");
+                                                exit(1);
+                                        }
-                                br->ip6sandbox = strdup(argv[i] + 6);
+                                        br->ip6sandbox = strdup(argv[i] + 6);
-                                if (br->ip6sandbox == NULL)
+                                        if (br->ip6sandbox == NULL)
-                                        errExit("strdup");
+                                                errExit("strdup");
+                                }
                        }
                        else
                                exit_err_feature("networking");
diff --git a/src/firejail/mountinfo.c b/src/firejail/mountinfo.c
index 162f5dbec..34d8d1700 100644
--- a/src/firejail/mountinfo.c
+++ b/src/firejail/mountinfo.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/netfilter.c b/src/firejail/netfilter.c
index bec32cfde..e0a2ce086 100644
--- a/src/firejail/netfilter.c
+++ b/src/firejail/netfilter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/netns.c b/src/firejail/netns.c
index 3d8edf5ae..104453376 100644
--- a/src/firejail/netns.c
+++ b/src/firejail/netns.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018 Firejail Authors
+ * Copyright (C) 2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/network.c b/src/firejail/network.c
index 93249a29b..aa05e3bd0 100644
--- a/src/firejail/network.c
+++ b/src/firejail/network.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/network_main.c b/src/firejail/network_main.c
index 6800bde8d..85896e528 100644
--- a/src/firejail/network_main.c
+++ b/src/firejail/network_main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -246,6 +246,10 @@ void net_check_cfg(void) {
        if (cfg.defaultgw)
                check_default_gw(cfg.defaultgw);
        else {
+                // if the first network has no assigned address,
+                // do not try to set up a gateway, because it will fail
+                if (cfg.bridge0.arg_ip_none)
+                        return;
                // first network is a regular bridge
                if (cfg.bridge0.macvlan == 0)
                        cfg.defaultgw = cfg.bridge0.ip;
diff --git a/src/firejail/no_sandbox.c b/src/firejail/no_sandbox.c
index dca36a4d8..8bf8adecc 100644
--- a/src/firejail/no_sandbox.c
+++ b/src/firejail/no_sandbox.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/output.c b/src/firejail/output.c
index bd7e44788..d4a7f464a 100644
--- a/src/firejail/output.c
+++ b/src/firejail/output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/paths.c b/src/firejail/paths.c
index 960412acf..f03d98e29 100644
--- a/src/firejail/paths.c
+++ b/src/firejail/paths.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/preproc.c b/src/firejail/preproc.c
index a2dea0339..278099e55 100644
--- a/src/firejail/preproc.c
+++ b/src/firejail/preproc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 9a724331b..969209869 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -672,7 +672,10 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                        // configure this IP address for the last bridge defined
                        if (strcmp(ptr + 3, "none") == 0)
                                br->arg_ip_none = 1;
-                        else {
+                        else if (strcmp(ptr + 3, "dhcp") == 0) {
+                                br->arg_ip_none = 1;
+                                br->arg_ip_dhcp = 1;
+                        } else {
                                if (atoip(ptr + 3, &br->ipsandbox)) {
                                        fprintf(stderr, "Error: invalid IP address\n");
                                        exit(1);
@@ -693,21 +696,24 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                                fprintf(stderr, "Error: no network device configured\n");
                                exit(1);
                        }
-                        if (br->ip6sandbox) {
+                        if (br->arg_ip6_dhcp || br->ip6sandbox) {
                                fprintf(stderr, "Error: cannot configure the IP address twice for the same interface\n");
                                exit(1);
                        }
                        // configure this IP address for the last bridge defined
-                        if (check_ip46_address(ptr + 4) == 0) {
+                        if (strcmp(ptr + 4, "dhcp") == 0)
-                                fprintf(stderr, "Error: invalid IPv6 address\n");
+                                br->arg_ip6_dhcp = 1;
-                                exit(1);
+                        else {
-                        }
+                                if (check_ip46_address(ptr + 4) == 0) {
+                                        fprintf(stderr, "Error: invalid IPv6 address\n");
-                        br->ip6sandbox = strdup(ptr + 4);
+                                        exit(1);
-                        if (br->ip6sandbox == NULL)
+                                }
-                                errExit("strdup");
+                                br->ip6sandbox = strdup(ptr + 4);
+                                if (br->ip6sandbox == NULL)
+                                        errExit("strdup");
+                        }
                }
                else
                        warning_feature_disabled("networking");
diff --git a/src/firejail/protocol.c b/src/firejail/protocol.c
index d3a9e0153..6402afbc6 100644
--- a/src/firejail/protocol.c
+++ b/src/firejail/protocol.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/pulseaudio.c b/src/firejail/pulseaudio.c
index b82473476..57095a53c 100644
--- a/src/firejail/pulseaudio.c
+++ b/src/firejail/pulseaudio.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/restrict_users.c b/src/firejail/restrict_users.c
index ee2e497cb..b51172219 100644
--- a/src/firejail/restrict_users.c
+++ b/src/firejail/restrict_users.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/restricted_shell.c b/src/firejail/restricted_shell.c
index ce809c697..b80d4ae55 100644
--- a/src/firejail/restricted_shell.c
+++ b/src/firejail/restricted_shell.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/rlimit.c b/src/firejail/rlimit.c
index ea9fb2d6b..0ca4a34df 100644
--- a/src/firejail/rlimit.c
+++ b/src/firejail/rlimit.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/run_files.c b/src/firejail/run_files.c
index 521a8aa02..b9c80c459 100644
--- a/src/firejail/run_files.c
+++ b/src/firejail/run_files.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/run_symlink.c b/src/firejail/run_symlink.c
index a63f29322..ea3889024 100644
--- a/src/firejail/run_symlink.c
+++ b/src/firejail/run_symlink.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 995e98f9f..96ad30bed 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -337,6 +337,8 @@ static int monitor_application(pid_t app_pid) {
                                continue;
                        if (pid == 1)
                                continue;
+                        if ((pid_t) pid == dhclient4_pid || (pid_t) pid == dhclient6_pid)
+                                continue;
                        // todo: make this generic
                        // Dillo browser leaves a dpid process running, we need to shut it down
@@ -993,7 +995,7 @@ int sandbox(void* sandbox_arg) {
                fs_dev_disable_dvd();
        if (arg_nou2f)
-                fs_dev_disable_u2f();
+                fs_dev_disable_u2f();
        if (arg_novideo)
                fs_dev_disable_video();
@@ -1016,6 +1018,11 @@ int sandbox(void* sandbox_arg) {
        fs_logger_change_owner();
        //****************************
+        // start dhcp client
+        //****************************
+        dhcp_start();
+        //****************************
        // set application environment
        //****************************
        EUID_USER();
diff --git a/src/firejail/sbox.c b/src/firejail/sbox.c
index e5739ecb5..203c0fc03 100644
--- a/src/firejail/sbox.c
+++ b/src/firejail/sbox.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -105,23 +105,34 @@ static struct sock_fprog prog = {
 };
 int sbox_run(unsigned filtermask, int num, ...) {
-        EUID_ROOT();
-        int i;
        va_list valist;
        va_start(valist, num);
        // build argument list
-        char *arg[num + 1];
+  char **arg = malloc((num + 1) * sizeof(char *));
+  int i;
        for (i = 0; i < num; i++)
                arg[i] = va_arg(valist, char*);
        arg[i] = NULL;
        va_end(valist);
+  int status = sbox_run_v(filtermask, arg); 
+  free(arg);
+  return status;
+}
+int sbox_run_v(unsigned filtermask, char * const arg[]) {
+        EUID_ROOT();
        if (arg_debug) {
                printf("sbox run: ");
-                for (i = 0; i <= num; i++)
+                int i = 0;
+                while (arg[i]) {
                        printf("%s ", arg[i]);
+                        i++;
+                }
                printf("\n");
        }
@@ -171,6 +182,7 @@ int sbox_run(unsigned filtermask, int num, ...) {
                // close all other file descriptors
                int max = 20; // getdtablesize() is overkill for a firejail process
+                int i = 3;
                for (i = 3; i < max; i++)
                        close(i); // close open files
@@ -179,20 +191,31 @@ int sbox_run(unsigned filtermask, int num, ...) {
                // apply filters
                if (filtermask & SBOX_CAPS_NONE) {
                        caps_drop_all();
-                }
+                } else {
-                else if (filtermask & SBOX_CAPS_NETWORK) {
+                        uint64_t set = 0;
+                        if (filtermask & SBOX_CAPS_NETWORK) {
 #ifndef HAVE_GCOV // the following filter will prevent GCOV from saving info in .gcda files
-                        uint64_t set = ((uint64_t) 1) << CAP_NET_ADMIN;
+                                set |= ((uint64_t) 1) << CAP_NET_ADMIN;
-                        set |=  ((uint64_t) 1) << CAP_NET_RAW;
+                                set |= ((uint64_t) 1) << CAP_NET_RAW;
-                        caps_set(set);
 #endif
-                }
+                        }
-                else if (filtermask & SBOX_CAPS_HIDEPID) {
+                        if (filtermask & SBOX_CAPS_HIDEPID) {
+#ifndef HAVE_GCOV // the following filter will prevent GCOV from saving info in .gcda files
+                                set |= ((uint64_t) 1) << CAP_SYS_PTRACE;
+                                set |= ((uint64_t) 1) << CAP_SYS_PACCT;
+#endif
+                        }
+                        if (filtermask & SBOX_CAPS_NET_SERVICE) {
 #ifndef HAVE_GCOV // the following filter will prevent GCOV from saving info in .gcda files
-                        uint64_t set = ((uint64_t) 1) << CAP_SYS_PTRACE;
+                                set |= ((uint64_t) 1) << CAP_NET_BIND_SERVICE;
-                        set |=  ((uint64_t) 1) << CAP_SYS_PACCT;
+                                set |= ((uint64_t) 1) << CAP_NET_BROADCAST;
-                        caps_set(set);
 #endif
+                        }
+                        if (set != 0) { // some SBOX_CAPS_ flag was specified, drop all other capabilities
+#ifndef HAVE_GCOV // the following filter will prevent GCOV from saving info in .gcda files
+                                caps_set(set);
+#endif
+                        }
                }
                if (filtermask & SBOX_SECCOMP) {
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c
index 648ce1612..10a2a5665 100644
--- a/src/firejail/seccomp.c
+++ b/src/firejail/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/shutdown.c b/src/firejail/shutdown.c
index 24b3665fc..a7d0b2fbe 100644
--- a/src/firejail/shutdown.c
+++ b/src/firejail/shutdown.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index fbace7374..52d4f7c03 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -82,7 +82,9 @@ static char *usage_str =
        "    --interface=name - move interface in sandbox.\n"
        "    --ip=address - set interface IP address.\n"
        "    --ip=none - no IP address and no default gateway are configured.\n"
+        "    --ip=dhcp - acquire IP address by running dhclient.\n"
        "    --ip6=address - set interface IPv6 address.\n"
+        "    --ip6=dhcp - acquire IPv6 address by running dhclient.\n"
        "    --iprange=address,address - configure an IP address in this range.\n"
 #endif
        "    --ipc-namespace - enable a new IPC namespace.\n"
diff --git a/src/firejail/util.c b/src/firejail/util.c
index 18d121ca9..6bfc80903 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firejail/x11.c b/src/firejail/x11.c
index b390ad38e..9a50532c2 100644
--- a/src/firejail/x11.c
+++ b/src/firejail/x11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/apparmor.c b/src/firemon/apparmor.c
index cf5808b00..028dbc212 100644
--- a/src/firemon/apparmor.c
+++ b/src/firemon/apparmor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/arp.c b/src/firemon/arp.c
index 9c8cb9f52..a43593ced 100644
--- a/src/firemon/arp.c
+++ b/src/firemon/arp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/caps.c b/src/firemon/caps.c
index c3e1aa5f1..951bd21a5 100644
--- a/src/firemon/caps.c
+++ b/src/firemon/caps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/cgroup.c b/src/firemon/cgroup.c
index f2020eafb..251db0077 100644
--- a/src/firemon/cgroup.c
+++ b/src/firemon/cgroup.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/cpu.c b/src/firemon/cpu.c
index 6186ff3f0..6170ef8c1 100644
--- a/src/firemon/cpu.c
+++ b/src/firemon/cpu.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/firemon.c b/src/firemon/firemon.c
index dad3b0afb..39c05d63e 100644
--- a/src/firemon/firemon.c
+++ b/src/firemon/firemon.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/firemon.h b/src/firemon/firemon.h
index 7f8bc698c..7a55a64fb 100644
--- a/src/firemon/firemon.h
+++ b/src/firemon/firemon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/interface.c b/src/firemon/interface.c
index 0a0801fee..325ffd80e 100644
--- a/src/firemon/interface.c
+++ b/src/firemon/interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/list.c b/src/firemon/list.c
index 68a066604..8a07f9eb2 100644
--- a/src/firemon/list.c
+++ b/src/firemon/list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/netstats.c b/src/firemon/netstats.c
index e7a4354d1..c746cc127 100644
--- a/src/firemon/netstats.c
+++ b/src/firemon/netstats.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/procevent.c b/src/firemon/procevent.c
index 762d22514..c823943c0 100644
--- a/src/firemon/procevent.c
+++ b/src/firemon/procevent.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/route.c b/src/firemon/route.c
index 105814434..9fd46505f 100644
--- a/src/firemon/route.c
+++ b/src/firemon/route.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/seccomp.c b/src/firemon/seccomp.c
index 099ac8819..7bc700ee6 100644
--- a/src/firemon/seccomp.c
+++ b/src/firemon/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/top.c b/src/firemon/top.c
index 514b9710e..ba707ef19 100644
--- a/src/firemon/top.c
+++ b/src/firemon/top.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/tree.c b/src/firemon/tree.c
index 9e9900c53..f3610eaec 100644
--- a/src/firemon/tree.c
+++ b/src/firemon/tree.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/usage.c b/src/firemon/usage.c
index 196fc32c3..0c3da00f8 100644
--- a/src/firemon/usage.c
+++ b/src/firemon/usage.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/firemon/x11.c b/src/firemon/x11.c
index 3eb06390a..a41f4825f 100644
--- a/src/firemon/x11.c
+++ b/src/firemon/x11.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fldd/main.c b/src/fldd/main.c
index d085ea59b..dd22e601e 100644
--- a/src/fldd/main.c
+++ b/src/fldd/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnet/arp.c b/src/fnet/arp.c
index a4fe02987..122d0007c 100644
--- a/src/fnet/arp.c
+++ b/src/fnet/arp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnet/fnet.h b/src/fnet/fnet.h
index 4900967f7..b9cf96c64 100644
--- a/src/fnet/fnet.h
+++ b/src/fnet/fnet.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -47,6 +47,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]);
 void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu);
 int net_if_mac(const char *ifname, const unsigned char mac[6]);
 void net_if_ip6(const char *ifname, const char *addr6);
+void net_if_waitll(const char *ifname);
 // arp.c
diff --git a/src/fnet/interface.c b/src/fnet/interface.c
index 7e7cceeed..62df0930e 100644
--- a/src/fnet/interface.c
+++ b/src/fnet/interface.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -28,6 +28,8 @@
 #include <net/if_arp.h>
 #include <net/route.h>
 #include <linux/if_bridge.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
 static void check_if_name(const char *ifname) {
        if (strlen(ifname) > IFNAMSIZ) {
@@ -370,3 +372,129 @@ void net_if_ip6(const char *ifname, const char *addr6) {
        close(sock);
 }
+static int net_netlink_address_tentative(struct nlmsghdr *current_header) {
+        struct ifaddrmsg *msg = NLMSG_DATA(current_header);
+        int has_flags = 0;
+#ifdef IFA_FLAGS
+        struct rtattr *rta = IFA_RTA(msg);
+        size_t msg_len = IFA_PAYLOAD(current_header);
+        while (RTA_OK(rta, msg_len)) {
+                if (rta->rta_type == IFA_FLAGS) {
+                        has_flags = 1;
+                        uint32_t *flags = RTA_DATA(rta);
+                        if (*flags & IFA_F_TENTATIVE)
+                                return 1;
+                }
+                rta = RTA_NEXT(rta, msg_len);
+        }
+#endif
+        // According to <linux/if_addr.h>, if an IFA_FLAGS attribute is present,
+        // the field ifa_flags should be ignored.
+        return !has_flags && (msg->ifa_flags & IFA_F_TENTATIVE);
+}
+static int net_netlink_if_has_ll(int sock, uint32_t index) {
+        struct {
+                struct nlmsghdr header;
+                struct ifaddrmsg message;
+        } req;
+        memset(&req, 0, sizeof(req));
+        req.header.nlmsg_len = NLMSG_LENGTH(sizeof(req.message));
+        req.header.nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
+        req.header.nlmsg_type = RTM_GETADDR;
+        req.message.ifa_family = AF_INET6;
+        if (send(sock, &req, req.header.nlmsg_len, 0) != req.header.nlmsg_len)
+                errExit("send");
+        int found = 0;
+        int all_parts_processed = 0;
+        while (!all_parts_processed) {
+                char buf[16384];
+                ssize_t len = recv(sock, buf, sizeof(buf), 0);
+                if (len < 0)
+                        errExit("recv");
+                if (len < (ssize_t) sizeof(struct nlmsghdr)) {
+                        fprintf(stderr, "Received incomplete netlink message\n");
+                        exit(1);
+                }
+                struct nlmsghdr *current_header = (struct nlmsghdr *) buf;
+                while (NLMSG_OK(current_header, len)) {
+                        switch (current_header->nlmsg_type) {
+                        case RTM_NEWADDR: {
+                                struct ifaddrmsg *msg = NLMSG_DATA(current_header);
+                                if (!found && msg->ifa_index == index && msg->ifa_scope == RT_SCOPE_LINK &&
+                                                !net_netlink_address_tentative(current_header))
+                                        found = 1;
+                        }
+                                break;
+                        case NLMSG_NOOP:
+                                break;
+                        case NLMSG_DONE:
+                                all_parts_processed = 1;
+                                break;
+                        case NLMSG_ERROR: {
+                                struct nlmsgerr *err = NLMSG_DATA(current_header);
+                                fprintf(stderr, "Netlink error: %d\n", err->error);
+                                exit(1);
+                        }
+                                break;
+                        default:
+                                fprintf(stderr, "Unknown netlink message type: %u\n", current_header->nlmsg_type);
+                                exit(1);
+                                break;
+                        }
+                        current_header = NLMSG_NEXT(current_header, len);
+                }
+        }
+        return found;
+}
+// wait for a link-local IPv6 address for DHCPv6
+// ex: firejail --net=br0 --ip6=dhcp
+void net_if_waitll(const char *ifname) {
+        // find interface index
+        int inet6_sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_IP);
+        if (inet6_sock < 0) {
+                fprintf(stderr, "Error fnet: IPv6 is not supported on this system\n");
+                exit(1);
+        }
+        struct ifreq ifr;
+        memset(&ifr, 0, sizeof(ifr));
+        strncpy(ifr.ifr_name, ifname, IFNAMSIZ - 1);
+        ifr.ifr_addr.sa_family = AF_INET;
+        if (ioctl(inet6_sock, SIOGIFINDEX, &ifr) < 0) {
+                perror("ioctl SIOGIFINDEX");
+                exit(1);
+        }
+        close(inet6_sock);
+        if (ifr.ifr_ifindex < 0) {
+                fprintf(stderr, "Error fnet: interface index is negative\n");
+                exit(1);
+        }
+        uint32_t index = (uint32_t) ifr.ifr_ifindex;
+        // poll for link-local address
+        int netlink_sock = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+        if (netlink_sock < 0)
+                errExit("socket");
+        int tries = 0;
+        int found = 0;
+        while (tries < 60 && !found) {
+                if (tries >= 1)
+                        usleep(500000);
+                found = net_netlink_if_has_ll(netlink_sock, index);
+                tries++;
+        }
+        close(netlink_sock);
+        if (!found) {
+                fprintf(stderr, "Waiting for link-local IPv6 address of %s timed out\n", ifname);
+                exit(1);
+        }
+}
diff --git a/src/fnet/main.c b/src/fnet/main.c
index 890f842f6..95e12164e 100644
--- a/src/fnet/main.c
+++ b/src/fnet/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -47,6 +47,7 @@ static void usage(void) {
        printf("\tfnet config mac addr\n");
        printf("\tfnet config ipv6 dev ip\n");
        printf("\tfnet ifup dev\n");
+  printf("\tfnet waitll dev\n");
 }
 int main(int argc, char **argv) {
@@ -141,6 +142,9 @@ printf("\n");
        else if (argc == 5 && strcmp(argv[1], "config") == 0 && strcmp(argv[2], "ipv6") == 0) {
                net_if_ip6(argv[3], argv[4]);
        }
+  else if (argc == 3 && strcmp(argv[1], "waitll") == 0) {
+    net_if_waitll(argv[2]);
+  }
        else {
                fprintf(stderr, "Error fnet: invalid arguments\n");
                return 1;
diff --git a/src/fnet/veth.c b/src/fnet/veth.c
index 7a32da2d1..777e4e07e 100644
--- a/src/fnet/veth.c
+++ b/src/fnet/veth.c
@@ -26,7 +26,7 @@
 *
 */
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fnetfilter/main.c b/src/fnetfilter/main.c
index 7be6390e5..8124beb1a 100644
--- a/src/fnetfilter/main.c
+++ b/src/fnetfilter/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-optimize/fsec_optimize.h b/src/fsec-optimize/fsec_optimize.h
index 279118bee..211111641 100644
--- a/src/fsec-optimize/fsec_optimize.h
+++ b/src/fsec-optimize/fsec_optimize.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-optimize/main.c b/src/fsec-optimize/main.c
index b968bd5f3..416d85b88 100644
--- a/src/fsec-optimize/main.c
+++ b/src/fsec-optimize/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-optimize/optimizer.c b/src/fsec-optimize/optimizer.c
index 69b99f595..776beaa75 100644
--- a/src/fsec-optimize/optimizer.c
+++ b/src/fsec-optimize/optimizer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-print/fsec_print.h b/src/fsec-print/fsec_print.h
index 777bc609a..0237fd020 100644
--- a/src/fsec-print/fsec_print.h
+++ b/src/fsec-print/fsec_print.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c
index ed942c806..728308dac 100644
--- a/src/fsec-print/main.c
+++ b/src/fsec-print/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-print/print.c b/src/fsec-print/print.c
index 8a5d69120..5c244b000 100644
--- a/src/fsec-print/print.c
+++ b/src/fsec-print/print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fsec-print/syscall_list.c b/src/fsec-print/syscall_list.c
index db443f5e2..274908cef 100644
--- a/src/fsec-print/syscall_list.c
+++ b/src/fsec-print/syscall_list.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/errno.c b/src/fseccomp/errno.c
index d4c2b9249..9c5aa770c 100644
--- a/src/fseccomp/errno.c
+++ b/src/fseccomp/errno.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/fseccomp.h b/src/fseccomp/fseccomp.h
index e1579d098..bf55870f2 100644
--- a/src/fseccomp/fseccomp.h
+++ b/src/fseccomp/fseccomp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/main.c b/src/fseccomp/main.c
index faf38ade1..82b96f476 100644
--- a/src/fseccomp/main.c
+++ b/src/fseccomp/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/protocol.c b/src/fseccomp/protocol.c
index cdd9f3a40..7a21eb2c2 100644
--- a/src/fseccomp/protocol.c
+++ b/src/fseccomp/protocol.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/seccomp.c b/src/fseccomp/seccomp.c
index 95c20d388..29aa2f2f5 100644
--- a/src/fseccomp/seccomp.c
+++ b/src/fseccomp/seccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/seccomp_file.c b/src/fseccomp/seccomp_file.c
index 266ef0c55..e47e8db25 100644
--- a/src/fseccomp/seccomp_file.c
+++ b/src/fseccomp/seccomp_file.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/seccomp_secondary.c b/src/fseccomp/seccomp_secondary.c
index fd0bc5a50..9a00d1884 100644
--- a/src/fseccomp/seccomp_secondary.c
+++ b/src/fseccomp/seccomp_secondary.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fseccomp/syscall.c b/src/fseccomp/syscall.c
index 1683d3140..2b112245c 100644
--- a/src/fseccomp/syscall.c
+++ b/src/fseccomp/syscall.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/fshaper/fshaper.sh b/src/fshaper/fshaper.sh
index 30a07fb86..936a23512 100755
--- a/src/fshaper/fshaper.sh
+++ b/src/fshaper/fshaper.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 usage() {
        echo "Usage:"
diff --git a/src/ftee/ftee.h b/src/ftee/ftee.h
index 0b026aa7f..aec64595d 100644
--- a/src/ftee/ftee.h
+++ b/src/ftee/ftee.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/ftee/main.c b/src/ftee/main.c
index f488c10a2..a1e42ed32 100644
--- a/src/ftee/main.c
+++ b/src/ftee/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/common.h b/src/include/common.h
index 699ed765d..c65ba0d55 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/euid_common.h b/src/include/euid_common.h
index 9975c72bf..d8277ade7 100644
--- a/src/include/euid_common.h
+++ b/src/include/euid_common.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/firejail_user.h b/src/include/firejail_user.h
index 21311bc5d..a8d269daa 100644
--- a/src/include/firejail_user.h
+++ b/src/include/firejail_user.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/ldd_utils.h b/src/include/ldd_utils.h
index c9e8b4098..29dd8926e 100644
--- a/src/include/ldd_utils.h
+++ b/src/include/ldd_utils.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/pid.h b/src/include/pid.h
index 9d4735bdd..1f15d3c68 100644
--- a/src/include/pid.h
+++ b/src/include/pid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/rundefs.h b/src/include/rundefs.h
index df135b9ca..7f9c68be2 100644
--- a/src/include/rundefs.h
+++ b/src/include/rundefs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -49,6 +49,12 @@
 #define RUN_LIB_DIR                     RUN_MNT_DIR "/lib"
 #define RUN_LIB_FILE                    RUN_MNT_DIR "/libfiles"
 #define RUN_DNS_ETC                     RUN_MNT_DIR "/dns-etc"
+#define RUN_DHCLIENT_DIR                        RUN_MNT_DIR "/dhclient"
+#define RUN_DHCLIENT_4_LEASES_FILE              RUN_DHCLIENT_DIR "/dhclient.leases"
+#define RUN_DHCLIENT_6_LEASES_FILE              RUN_DHCLIENT_DIR "/dhclient6.leases"
+#define RUN_DHCLIENT_4_LEASES_FILE              RUN_DHCLIENT_DIR "/dhclient.leases"
+#define RUN_DHCLIENT_4_PID_FILE                 RUN_DHCLIENT_DIR "/dhclient.pid"
+#define RUN_DHCLIENT_6_PID_FILE                 RUN_DHCLIENT_DIR "/dhclient6.pid"
 #define RUN_SECCOMP_DIR                 RUN_MNT_DIR "/seccomp"
 #define RUN_SECCOMP_LIST                RUN_SECCOMP_DIR "/seccomp.list"         // list of seccomp files installed
diff --git a/src/include/seccomp.h b/src/include/seccomp.h
index 6af84f821..80a83df34 100644
--- a/src/include/seccomp.h
+++ b/src/include/seccomp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/include/syscall.h b/src/include/syscall.h
index 766f771cf..e11c56a05 100644
--- a/src/include/syscall.h
+++ b/src/include/syscall.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/common.c b/src/lib/common.c
index 3a7f910e1..1fd317d4f 100644
--- a/src/lib/common.c
+++ b/src/lib/common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/firejail_user.c b/src/lib/firejail_user.c
index f7234cc08..dbf2ca94b 100644
--- a/src/lib/firejail_user.c
+++ b/src/lib/firejail_user.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/ldd_utils.c b/src/lib/ldd_utils.c
index 453c7e9dc..32bfb0974 100644
--- a/src/lib/ldd_utils.c
+++ b/src/lib/ldd_utils.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/lib/pid.c b/src/lib/pid.c
index 04bc8d132..cad0e5424 100644
--- a/src/lib/pid.c
+++ b/src/lib/pid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
@@ -17,6 +17,7 @@
 * with this program; if not, write to the Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "../include/common.h"
 #include "../include/pid.h"
 #include <string.h>
diff --git a/src/libpostexecseccomp/libpostexecseccomp.c b/src/libpostexecseccomp/libpostexecseccomp.c
index b2f64f18e..c86faa329 100644
--- a/src/libpostexecseccomp/libpostexecseccomp.c
+++ b/src/libpostexecseccomp/libpostexecseccomp.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/libtrace/libtrace.c b/src/libtrace/libtrace.c
index 93fa9d5f8..a27fa7a03 100644
--- a/src/libtrace/libtrace.c
+++ b/src/libtrace/libtrace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/libtracelog/libtracelog.c b/src/libtracelog/libtracelog.c
index 3641a81af..9102a8ef6 100644
--- a/src/libtracelog/libtracelog.c
+++ b/src/libtracelog/libtracelog.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 719a80c2c..84aed41a4 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -582,6 +582,33 @@ net eth0
 ip none
 .TP
+\fBip dhcp
+Acquire an IP address and default gateway for the last interface defined by a
+net command, as well as set the DNS servers according to the DHCP response.
+This command requires the ISC dhclient DHCP client to be installed and will start
+it automatically inside the sandbox.
+.br
+.br
+Example:
+.br
+net br0
+.br
+ip dhcp
+.br
+.br
+This command should not be used in conjunction with the dns command if the
+DHCP server is set to configure DNS servers for the clients, because the
+manually specified DNS servers will be overwritten.
+.br
+The DHCP client will NOT release the DHCP lease when the sandbox terminates.
+If your DHCP server requires leases to be explicitly released, consider running
+a DHCP client and releasing the lease manually in conjunction with the
+net none command.
+.TP
 \fBip6 address
 Assign IPv6 addresses to the last network interface defined by a net command.
 .br
@@ -594,6 +621,32 @@ net eth0
 ip6 2001:0db8:0:f101::1/64
 .TP
+\fBip6 dhcp
+Acquire an IPv6 address and default gateway for the last interface defined by a
+net command, as well as set the DNS servers according to the DHCP response.
+This command requires the ISC dhclient DHCP client to be installed and will start
+it automatically inside the sandbox.
+.br
+.br
+Example:
+.br
+net br0
+.br
+ip6 dhcp
+.br
+.br
+This command should not be used in conjunction with the dns command if the
+DHCP server is set to configure DNS servers for the clients, because the
+manually specified DNS servers will be overwritten.
+.br
+The DHCP client will NOT release the DHCP lease when the sandbox terminates.
+If your DHCP server requires leases to be explicitly released, consider running
+a DHCP client and releasing the lease manually.
+.TP
 \fBiprange address,address
 Assign  an  IP address in the provided range to the last network
 interface defined by  a  net command.  A  default  gateway  is assigned by default.
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 32ac07d72..4b1134686 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -567,6 +567,31 @@ If the corresponding interface doesn't have an IP address configured, this
 option is enabled by default.
 .TP
+\fB\-\-ip=dhcp
+Acquire an IP address and default gateway for the last interface defined by a
+\-\-net option, as well as set the DNS servers according to the DHCP response.
+This option requires the ISC dhclient DHCP client to be installed and will start
+it automatically inside the sandbox.
+.br
+.br
+Example:
+.br
+$ firejail \-\-net=br0 \-\-ip=dhcp
+.br
+.br
+This option should not be used in conjunction with the \-\-dns option if the
+DHCP server is set to configure DNS servers for the clients, because the
+manually specified DNS servers will be overwritten.
+.br
+The DHCP client will NOT release the DHCP lease when the sandbox terminates.
+If your DHCP server requires leases to be explicitly released, consider running
+a DHCP client and releasing the lease manually in conjunction with the
+\-\-net=none option.
+.TP
 \fB\-\-ip6=address
 Assign IPv6 addresses to the last network interface defined by a \-\-net option.
 .br
@@ -579,6 +604,30 @@ $ firejail \-\-net=eth0 \-\-ip6=2001:0db8:0:f101::1/64 firefox
 Note: you don't need this option if you obtain your ip6 address from router via SLAAC (your ip6 address and default route will be configured by kernel automatically).
 .TP
+\fB\-\-ip6=dhcp
+Acquire an IPv6 address and default gateway for the last interface defined by a
+\-\-net option, as well as set the DNS servers according to the DHCP response.
+This option requires the ISC dhclient DHCP client to be installed and will start
+it automatically inside the sandbox.
+.br
+.br
+Example:
+.br
+$ firejail \-\-net=br0 \-\-ip6=dhcp
+.br
+.br
+This option should not be used in conjunction with the \-\-dns option if the
+DHCP server is set to configure DNS servers for the clients, because the
+manually specified DNS servers will be overwritten.
+.br
+The DHCP client will NOT release the DHCP lease when the sandbox terminates.
+If your DHCP server requires leases to be explicitly released, consider running
+a DHCP client and releasing the lease manually.
+.TP
 \fB\-\-iprange=address,address
 Assign an IP address in the provided range to the last network interface defined by a \-\-net option. A
 default gateway is assigned by default.
@@ -2235,7 +2284,7 @@ $ firejail --tunnel firefox
 .br
 .TP
 \fB\-\-version
-Print program version and exit.
+Print program version/compile time support and exit.
 .br
 .br
@@ -2245,6 +2294,20 @@ $ firejail \-\-version
 .br
 firejail version 0.9.27
+Compile time support:
+    - AppArmor support is enabled
+    - AppImage support is enabled
+    - chroot support is enabled
+    - file and directory whitelisting support is enabled
+    - file transfer support is enabled
+    - firetunnel support is enabled
+    - networking support is enabled
+    - overlayfs support is enabled
+    - private-home support is enabled
+    - seccomp-bpf support is enabled
+    - user namespace support is enabled
+    - X11 sandboxing support is enabled
+.br
 .TP
 \fB\-\-veth-name=name
 Use this name for the interface connected to the bridge for --net=bridge_interface commands,
diff --git a/src/tools/check-caps.sh b/src/tools/check-caps.sh
index 13525677b..34ac5993d 100755
--- a/src/tools/check-caps.sh
+++ b/src/tools/check-caps.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 if [ $# -eq 0 ]
 then
diff --git a/src/tools/extract_caps.c b/src/tools/extract_caps.c
index 24c2b1bd1..d76749e44 100644
--- a/src/tools/extract_caps.c
+++ b/src/tools/extract_caps.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/tools/extract_errnos.sh b/src/tools/extract_errnos.sh
index 43b225828..286fdd767 100644
--- a/src/tools/extract_errnos.sh
+++ b/src/tools/extract_errnos.sh
@@ -1,3 +1,8 @@
+#!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 echo -e "#include <errno.h>\n#include <attr/xattr.h>" | \
    cpp -dD | \
    grep "^#define E" | \
diff --git a/src/tools/extract_syscalls.c b/src/tools/extract_syscalls.c
index d762d283b..83c2f65f3 100644
--- a/src/tools/extract_syscalls.c
+++ b/src/tools/extract_syscalls.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh
index d4a68e397..b21418d5c 100755
--- a/src/tools/mkcoverit.sh
+++ b/src/tools/mkcoverit.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 # unpack firejail archive
 ARCFIREJAIL=`ls *.tar.xz| grep firejail`
diff --git a/src/tools/testuid.c b/src/tools/testuid.c
index 2f85d0252..ad3d2be5f 100644
--- a/src/tools/testuid.c
+++ b/src/tools/testuid.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/src/tools/ttytest.c b/src/tools/ttytest.c
index a449bf9ba..beaeb4fbe 100644
--- a/src/tools/ttytest.c
+++ b/src/tools/ttytest.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2014-2020 Firejail Authors
+ *
+ * This file is part of firejail project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 #define _XOPEN_SOURCE 600
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/tools/unixsocket.c b/src/tools/unixsocket.c
index c4302eed3..0987deb7a 100644
--- a/src/tools/unixsocket.c
+++ b/src/tools/unixsocket.c
@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) 2014-2020 Firejail Authors
+ *
+ * This file is part of firejail project
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp
index 4c6a778b2..03c7218ac 100755
--- a/test/appimage/appimage-args.exp
+++ b/test/appimage/appimage-args.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage-trace.exp b/test/appimage/appimage-trace.exp
index 574bd5a97..07a0aac0d 100755
--- a/test/appimage/appimage-trace.exp
+++ b/test/appimage/appimage-trace.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp
index 4522afa9b..7b6fa2120 100755
--- a/test/appimage/appimage-v1.exp
+++ b/test/appimage/appimage-v1.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp
index 50466958d..ccdeae0aa 100755
--- a/test/appimage/appimage-v2.exp
+++ b/test/appimage/appimage-v2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/appimage/appimage.sh b/test/appimage/appimage.sh
index 937ae9f31..fa1a53195 100755
--- a/test/appimage/appimage.sh
+++ b/test/appimage/appimage.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/appimage/filename.exp b/test/appimage/filename.exp
index 48bea4b3f..e4c7d3a95 100755
--- a/test/appimage/filename.exp
+++ b/test/appimage/filename.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh
index 40ae4017c..843fdc50b 100755
--- a/test/apps-x11-xorg/apps-x11-xorg.sh
+++ b/test/apps-x11-xorg/apps-x11-xorg.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/apps-x11-xorg/firefox.exp b/test/apps-x11-xorg/firefox.exp
index 39b18aec0..0a43db568 100755
--- a/test/apps-x11-xorg/firefox.exp
+++ b/test/apps-x11-xorg/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11-xorg/thunderbird.exp b/test/apps-x11-xorg/thunderbird.exp
index c46a5b6f0..8cf0ac244 100755
--- a/test/apps-x11-xorg/thunderbird.exp
+++ b/test/apps-x11-xorg/thunderbird.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11-xorg/transmission-gtk.exp b/test/apps-x11-xorg/transmission-gtk.exp
index 5dfabd611..fdbf388e9 100755
--- a/test/apps-x11-xorg/transmission-gtk.exp
+++ b/test/apps-x11-xorg/transmission-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh
index 8badbc3be..609eb5dc9 100755
--- a/test/apps-x11/apps-x11.sh
+++ b/test/apps-x11/apps-x11.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/apps-x11/chromium.exp b/test/apps-x11/chromium.exp
index 8ec03674b..14f8ff616 100755
--- a/test/apps-x11/chromium.exp
+++ b/test/apps-x11/chromium.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/firefox.exp b/test/apps-x11/firefox.exp
index 8201b829f..8de9d939b 100755
--- a/test/apps-x11/firefox.exp
+++ b/test/apps-x11/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/thunderbird.exp b/test/apps-x11/thunderbird.exp
index cde842697..73133fa1b 100755
--- a/test/apps-x11/thunderbird.exp
+++ b/test/apps-x11/thunderbird.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/transmission-gtk.exp b/test/apps-x11/transmission-gtk.exp
index 19dc1a24f..a8ce1d940 100755
--- a/test/apps-x11/transmission-gtk.exp
+++ b/test/apps-x11/transmission-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/x11-none.exp b/test/apps-x11/x11-none.exp
index 43adf67e2..3f56a3072 100755
--- a/test/apps-x11/x11-none.exp
+++ b/test/apps-x11/x11-none.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/x11-xephyr.exp b/test/apps-x11/x11-xephyr.exp
index 6b8fa7da7..4efdbc4f0 100755
--- a/test/apps-x11/x11-xephyr.exp
+++ b/test/apps-x11/x11-xephyr.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/xterm-xephyr.exp b/test/apps-x11/xterm-xephyr.exp
index 5cbab4eb1..7dc193110 100755
--- a/test/apps-x11/xterm-xephyr.exp
+++ b/test/apps-x11/xterm-xephyr.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/xterm-xorg.exp b/test/apps-x11/xterm-xorg.exp
index 2ec25e6c3..893306830 100755
--- a/test/apps-x11/xterm-xorg.exp
+++ b/test/apps-x11/xterm-xorg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps-x11/xterm-xpra.exp b/test/apps-x11/xterm-xpra.exp
index 9134dbdce..0b35a7009 100755
--- a/test/apps-x11/xterm-xpra.exp
+++ b/test/apps-x11/xterm-xpra.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/apps.sh b/test/apps/apps.sh
index c129846dd..1e5f0f8c5 100755
--- a/test/apps/apps.sh
+++ b/test/apps/apps.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/apps/chromium.exp b/test/apps/chromium.exp
index 664d4918f..d6375323e 100755
--- a/test/apps/chromium.exp
+++ b/test/apps/chromium.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/deluge.exp b/test/apps/deluge.exp
index 8d685e0c5..92f50fc8a 100755
--- a/test/apps/deluge.exp
+++ b/test/apps/deluge.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/fbreader.exp b/test/apps/fbreader.exp
index 52d7ff268..55f7dd49f 100755
--- a/test/apps/fbreader.exp
+++ b/test/apps/fbreader.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/filezilla.exp b/test/apps/filezilla.exp
index 74f478ace..9952a4d29 100755
--- a/test/apps/filezilla.exp
+++ b/test/apps/filezilla.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/firefox.exp b/test/apps/firefox.exp
index 34164d780..9869972f0 100755
--- a/test/apps/firefox.exp
+++ b/test/apps/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/gnome-mplayer.exp b/test/apps/gnome-mplayer.exp
index 12d0a880d..1d00cdd9b 100755
--- a/test/apps/gnome-mplayer.exp
+++ b/test/apps/gnome-mplayer.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/gthumb.exp b/test/apps/gthumb.exp
index 0631dff6f..9fba8a98e 100755
--- a/test/apps/gthumb.exp
+++ b/test/apps/gthumb.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/hexchat.exp b/test/apps/hexchat.exp
index ec859df25..b933e1edb 100755
--- a/test/apps/hexchat.exp
+++ b/test/apps/hexchat.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/kcalc.exp b/test/apps/kcalc.exp
index fac1a7344..ae743cf23 100755
--- a/test/apps/kcalc.exp
+++ b/test/apps/kcalc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/ktorrent.exp b/test/apps/ktorrent.exp
index 527de98fe..ef177bd08 100755
--- a/test/apps/ktorrent.exp
+++ b/test/apps/ktorrent.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/midori.exp b/test/apps/midori.exp
index 4dd4160f9..78a55313f 100755
--- a/test/apps/midori.exp
+++ b/test/apps/midori.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/opera.exp b/test/apps/opera.exp
index 72ad5e27a..b88368ec6 100755
--- a/test/apps/opera.exp
+++ b/test/apps/opera.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/qbittorrent.exp b/test/apps/qbittorrent.exp
index f0f3c5c6c..67dfa73c7 100755
--- a/test/apps/qbittorrent.exp
+++ b/test/apps/qbittorrent.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/thunderbird.exp b/test/apps/thunderbird.exp
index 1d2711694..319ebbccf 100755
--- a/test/apps/thunderbird.exp
+++ b/test/apps/thunderbird.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/transmission-qt.exp b/test/apps/transmission-qt.exp
index 0fe70f659..4aec7d094 100755
--- a/test/apps/transmission-qt.exp
+++ b/test/apps/transmission-qt.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/uget-gtk.exp b/test/apps/uget-gtk.exp
index 00e6d1b17..397c63846 100755
--- a/test/apps/uget-gtk.exp
+++ b/test/apps/uget-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/vlc.exp b/test/apps/vlc.exp
index 04e8a3757..8110a6d93 100755
--- a/test/apps/vlc.exp
+++ b/test/apps/vlc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/wine.exp b/test/apps/wine.exp
index f045e47da..af8c5dca8 100755
--- a/test/apps/wine.exp
+++ b/test/apps/wine.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/apps/xchat.exp b/test/apps/xchat.exp
index dae8638ef..1d88ef7e4 100755
--- a/test/apps/xchat.exp
+++ b/test/apps/xchat.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/arguments/arguments.sh b/test/arguments/arguments.sh
index fc1bc64e1..12e2aac6d 100755
--- a/test/arguments/arguments.sh
+++ b/test/arguments/arguments.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 export LC_ALL=C
 if [ -f /etc/debian_version ]; then
diff --git a/test/arguments/bashrun.exp b/test/arguments/bashrun.exp
index a3c9e382d..782484cad 100755
--- a/test/arguments/bashrun.exp
+++ b/test/arguments/bashrun.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/arguments/bashrun.sh b/test/arguments/bashrun.sh
index a4773fd6c..433d92436 100755
--- a/test/arguments/bashrun.sh
+++ b/test/arguments/bashrun.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 echo "TESTING: 1.1 - simple args"
 firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --quiet faudit arg1 arg2
diff --git a/test/arguments/joinrun.exp b/test/arguments/joinrun.exp
index 97972e5e8..8359b4819 100755
--- a/test/arguments/joinrun.exp
+++ b/test/arguments/joinrun.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/arguments/joinrun.sh b/test/arguments/joinrun.sh
index b00ea0e80..0019563be 100755
--- a/test/arguments/joinrun.sh
+++ b/test/arguments/joinrun.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 echo "TESTING: 3.1 - simple args"
 firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --join=joinrun faudit arg1 arg2
diff --git a/test/arguments/outrun.exp b/test/arguments/outrun.exp
index d28e75661..46a226870 100755
--- a/test/arguments/outrun.exp
+++ b/test/arguments/outrun.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/arguments/outrun.sh b/test/arguments/outrun.sh
index 5bc3b1e37..4e8b52417 100755
--- a/test/arguments/outrun.sh
+++ b/test/arguments/outrun.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 echo "TESTING: 4.1 - simple args"
 firejail --env=FIREJAIL_TEST_ARGUMENTS=yes --output=out faudit arg1 arg2
diff --git a/test/arguments/symrun.exp b/test/arguments/symrun.exp
index 10e7ac6c8..49e0d28e0 100755
--- a/test/arguments/symrun.exp
+++ b/test/arguments/symrun.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/arguments/symrun.sh b/test/arguments/symrun.sh
index db5f06835..00c17df69 100755
--- a/test/arguments/symrun.sh
+++ b/test/arguments/symrun.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 mkdir symtest
 ln -s /usr/bin/firejail symtest/faudit
diff --git a/test/chroot/chroot.sh b/test/chroot/chroot.sh
index ecadb899a..7f65b2188 100755
--- a/test/chroot/chroot.sh
+++ b/test/chroot/chroot.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/chroot/configure b/test/chroot/configure
index 26a516931..465092abb 100755
--- a/test/chroot/configure
+++ b/test/chroot/configure
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 # build a very small chroot
 ROOTDIR="/tmp/chroot"                   # default chroot directory
diff --git a/test/chroot/fs_chroot.exp b/test/chroot/fs_chroot.exp
index a071027e5..1db8269b9 100755
--- a/test/chroot/fs_chroot.exp
+++ b/test/chroot/fs_chroot.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/chroot/unchroot-as-root.exp b/test/chroot/unchroot-as-root.exp
index e4bedd539..844bd7450 100755
--- a/test/chroot/unchroot-as-root.exp
+++ b/test/chroot/unchroot-as-root.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/chroot/unchroot.c b/test/chroot/unchroot.c
index 4919637d6..4454dd1c4 100644
--- a/test/chroot/unchroot.c
+++ b/test/chroot/unchroot.c
@@ -1,3 +1,7 @@
+// This file is part of Firejail project
+// Copyright (C) 2014-2020 Firejail Authors
+// License GPL v2
 // simple unchroot example from http://linux-vserver.org/Secure_chroot_Barrier
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/test/compile/compile.sh b/test/compile/compile.sh
index e662b4d30..ccf37dc40 100755
--- a/test/compile/compile.sh
+++ b/test/compile/compile.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 arr[1]="TEST 1: standard compilation"
 arr[2]="TEST 2: compile seccomp disabled"
diff --git a/test/environment/allow-debuggers.exp b/test/environment/allow-debuggers.exp
index f92ec5ddf..c2f4be64c 100755
--- a/test/environment/allow-debuggers.exp
+++ b/test/environment/allow-debuggers.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 cd /home
diff --git a/test/environment/csh.exp b/test/environment/csh.exp
index 7b5ab9b33..ff61e6a83 100755
--- a/test/environment/csh.exp
+++ b/test/environment/csh.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 cd /home
diff --git a/test/environment/dash.exp b/test/environment/dash.exp
index cad4422a0..82e2f5cad 100755
--- a/test/environment/dash.exp
+++ b/test/environment/dash.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 cd /home
diff --git a/test/environment/deterministic-exit-code.exp b/test/environment/deterministic-exit-code.exp
index 165b9ebe0..a92203b2d 100755
--- a/test/environment/deterministic-exit-code.exp
+++ b/test/environment/deterministic-exit-code.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 4
diff --git a/test/environment/dns.exp b/test/environment/dns.exp
index d1f3f650f..801a7e2b1 100755
--- a/test/environment/dns.exp
+++ b/test/environment/dns.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/environment/doubledash.exp b/test/environment/doubledash.exp
index ed0419f2d..60d4700dd 100755
--- a/test/environment/doubledash.exp
+++ b/test/environment/doubledash.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/environment/env.exp b/test/environment/env.exp
index da16f81b3..107a41beb 100755
--- a/test/environment/env.exp
+++ b/test/environment/env.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index f860f7c24..e88036d3d 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/environment/extract_command.exp b/test/environment/extract_command.exp
index 72d7501aa..50a933ec3 100755
--- a/test/environment/extract_command.exp
+++ b/test/environment/extract_command.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/environment/firejail-in-firejail.exp b/test/environment/firejail-in-firejail.exp
index 53ddde807..be422a294 100755
--- a/test/environment/firejail-in-firejail.exp
+++ b/test/environment/firejail-in-firejail.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/hostfile.exp b/test/environment/hostfile.exp
index 86acd7f3c..7f5034931 100755
--- a/test/environment/hostfile.exp
+++ b/test/environment/hostfile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
diff --git a/test/environment/ibus.exp b/test/environment/ibus.exp
index 75c7f5450..857cef38c 100755
--- a/test/environment/ibus.exp
+++ b/test/environment/ibus.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 cd /home
diff --git a/test/environment/machineid.exp b/test/environment/machineid.exp
index 7d3bdee43..ecfd70f55 100755
--- a/test/environment/machineid.exp
+++ b/test/environment/machineid.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
diff --git a/test/environment/nice.exp b/test/environment/nice.exp
index 81f81e0b8..b4afc28d2 100755
--- a/test/environment/nice.exp
+++ b/test/environment/nice.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/output.exp b/test/environment/output.exp
index d175ddae2..0ad5250c1 100755
--- a/test/environment/output.exp
+++ b/test/environment/output.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/environment/output.sh b/test/environment/output.sh
index 2be188e3a..14c20a79a 100755
--- a/test/environment/output.sh
+++ b/test/environment/output.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 i="0"
diff --git a/test/environment/quiet.exp b/test/environment/quiet.exp
index 28b1a9f4f..0a22051f5 100755
--- a/test/environment/quiet.exp
+++ b/test/environment/quiet.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 4
diff --git a/test/environment/rlimit-bad-profile.exp b/test/environment/rlimit-bad-profile.exp
index cd77402fd..35d9b4479 100755
--- a/test/environment/rlimit-bad-profile.exp
+++ b/test/environment/rlimit-bad-profile.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/environment/rlimit-bad.exp b/test/environment/rlimit-bad.exp
index 0a2fe9c98..7eaac27b6 100755
--- a/test/environment/rlimit-bad.exp
+++ b/test/environment/rlimit-bad.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/environment/rlimit-profile.exp b/test/environment/rlimit-profile.exp
index 43d6a3ee0..721e2196e 100755
--- a/test/environment/rlimit-profile.exp
+++ b/test/environment/rlimit-profile.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 #cd /home
diff --git a/test/environment/rlimit.exp b/test/environment/rlimit.exp
index 38cdc3eea..757faf1f9 100755
--- a/test/environment/rlimit.exp
+++ b/test/environment/rlimit.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 cd /home
diff --git a/test/environment/shell-none.exp b/test/environment/shell-none.exp
index 89d4cfda5..aed9adbd4 100755
--- a/test/environment/shell-none.exp
+++ b/test/environment/shell-none.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/sound.exp b/test/environment/sound.exp
index c44268708..fadad9eed 100755
--- a/test/environment/sound.exp
+++ b/test/environment/sound.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
diff --git a/test/environment/timeout.exp b/test/environment/timeout.exp
index 83aefabb9..c8b215084 100755
--- a/test/environment/timeout.exp
+++ b/test/environment/timeout.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/environment/umask.exp b/test/environment/umask.exp
index e93d71bd4..a3b80bd1c 100755
--- a/test/environment/umask.exp
+++ b/test/environment/umask.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/environment/zsh.exp b/test/environment/zsh.exp
index a1b94a326..8c493ac23 100755
--- a/test/environment/zsh.exp
+++ b/test/environment/zsh.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 cd /home
diff --git a/test/fcopy/cmdline.exp b/test/fcopy/cmdline.exp
index a10aab463..f0416d51e 100755
--- a/test/fcopy/cmdline.exp
+++ b/test/fcopy/cmdline.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fcopy/dircopy.exp b/test/fcopy/dircopy.exp
index d9e361d05..a74ce1616 100755
--- a/test/fcopy/dircopy.exp
+++ b/test/fcopy/dircopy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 #
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh
index b87518e03..96b515238 100755
--- a/test/fcopy/fcopy.sh
+++ b/test/fcopy/fcopy.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/fcopy/filecopy.exp b/test/fcopy/filecopy.exp
index ffad16911..7f7fbea9e 100755
--- a/test/fcopy/filecopy.exp
+++ b/test/fcopy/filecopy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 #
diff --git a/test/fcopy/linkcopy.exp b/test/fcopy/linkcopy.exp
index a82faf7bd..a9b3a067f 100755
--- a/test/fcopy/linkcopy.exp
+++ b/test/fcopy/linkcopy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 #
diff --git a/test/features/1.1.exp b/test/features/1.1.exp
index 2273a3b98..5cf3b724e 100755
--- a/test/features/1.1.exp
+++ b/test/features/1.1.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # disable /boot
 #
diff --git a/test/features/1.10.exp b/test/features/1.10.exp
index b668f5cd1..b37b6c568 100755
--- a/test/features/1.10.exp
+++ b/test/features/1.10.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # disable /selinux
 #
diff --git a/test/features/1.2.exp b/test/features/1.2.exp
index 81f9531cb..c9a9480a7 100755
--- a/test/features/1.2.exp
+++ b/test/features/1.2.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # new /proc
 #
diff --git a/test/features/1.4.exp b/test/features/1.4.exp
index de05536f0..a19589b6e 100755
--- a/test/features/1.4.exp
+++ b/test/features/1.4.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # mask other users
 #
diff --git a/test/features/1.5.exp b/test/features/1.5.exp
index 194c7859e..cd296bbd8 100755
--- a/test/features/1.5.exp
+++ b/test/features/1.5.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # PID namespace
 #
diff --git a/test/features/1.6.exp b/test/features/1.6.exp
index 111aca3c8..24951d27a 100755
--- a/test/features/1.6.exp
+++ b/test/features/1.6.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # new /var/log
 #
diff --git a/test/features/1.7.exp b/test/features/1.7.exp
index dc73ae529..701aa0ca5 100755
--- a/test/features/1.7.exp
+++ b/test/features/1.7.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # new /var/tmp
 #
diff --git a/test/features/1.8.exp b/test/features/1.8.exp
index 3bb43718e..bd7d7add2 100755
--- a/test/features/1.8.exp
+++ b/test/features/1.8.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # disable /etc/firejail and ~/.config/firejail
 #
diff --git a/test/features/2.1.exp b/test/features/2.1.exp
index d560d1a36..4ad3f3bff 100755
--- a/test/features/2.1.exp
+++ b/test/features/2.1.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # hostname
 #
diff --git a/test/features/2.2.exp b/test/features/2.2.exp
index 00ed20e1f..c8c6461dd 100755
--- a/test/features/2.2.exp
+++ b/test/features/2.2.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # DNS
 #
diff --git a/test/features/2.3.exp b/test/features/2.3.exp
index 9d3320d78..ccc2bd168 100755
--- a/test/features/2.3.exp
+++ b/test/features/2.3.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # mac-vlan
 #
diff --git a/test/features/2.4.exp b/test/features/2.4.exp
index 6784e1add..fb64d84c1 100755
--- a/test/features/2.4.exp
+++ b/test/features/2.4.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # bridge
 # - todo: ping test or equivalent on chroot
diff --git a/test/features/2.5.exp b/test/features/2.5.exp
index 2d4c7a9bc..74f47e1a1 100755
--- a/test/features/2.5.exp
+++ b/test/features/2.5.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # interface
 #
diff --git a/test/features/2.6.exp b/test/features/2.6.exp
index 63a9b3b90..27347d43d 100755
--- a/test/features/2.6.exp
+++ b/test/features/2.6.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # default gateway
 #
diff --git a/test/features/3.1.exp b/test/features/3.1.exp
index 3178cda42..c1167f296 100755
--- a/test/features/3.1.exp
+++ b/test/features/3.1.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # private
 #
diff --git a/test/features/3.10.exp b/test/features/3.10.exp
index d6d858322..fdec33d1b 100755
--- a/test/features/3.10.exp
+++ b/test/features/3.10.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # whitelist tmp
 #
diff --git a/test/features/3.11.exp b/test/features/3.11.exp
index 4e89aa372..27daaf752 100755
--- a/test/features/3.11.exp
+++ b/test/features/3.11.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # mkdir
 #
diff --git a/test/features/3.2.exp b/test/features/3.2.exp
index 271bbdda1..eae820dd7 100755
--- a/test/features/3.2.exp
+++ b/test/features/3.2.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # read-only
 #
diff --git a/test/features/3.3.exp b/test/features/3.3.exp
index c662410dc..9f58a1e1a 100755
--- a/test/features/3.3.exp
+++ b/test/features/3.3.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # blacklist
 #
diff --git a/test/features/3.4.exp b/test/features/3.4.exp
index 2e0f7cae7..343f2a37c 100755
--- a/test/features/3.4.exp
+++ b/test/features/3.4.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # whitelist home
 #
diff --git a/test/features/3.5.exp b/test/features/3.5.exp
index abaf42a0e..37e492ea4 100755
--- a/test/features/3.5.exp
+++ b/test/features/3.5.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # private-dev
 #
diff --git a/test/features/3.6.exp b/test/features/3.6.exp
index 043a24121..ca76f6a38 100755
--- a/test/features/3.6.exp
+++ b/test/features/3.6.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # private-etc
 #
diff --git a/test/features/3.7.exp b/test/features/3.7.exp
index bcd50c389..532c157af 100755
--- a/test/features/3.7.exp
+++ b/test/features/3.7.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # private-tmp
 #
diff --git a/test/features/3.8.exp b/test/features/3.8.exp
index 4497b9f19..80cdf7306 100755
--- a/test/features/3.8.exp
+++ b/test/features/3.8.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # private-bin
 #
diff --git a/test/features/3.9.exp b/test/features/3.9.exp
index e6cefa0f6..56a1fc006 100755
--- a/test/features/3.9.exp
+++ b/test/features/3.9.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # whitelist dev
 #
diff --git a/test/features/test.sh b/test/features/test.sh
index cb3f6f871..431a6491b 100755
--- a/test/features/test.sh
+++ b/test/features/test.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 export LC_ALL=C
 OVERLAY="overlay"
 CHROOT="chroot"
diff --git a/test/filters/apparmor.exp b/test/filters/apparmor.exp
index 9238a1148..32edba72a 100755
--- a/test/filters/apparmor.exp
+++ b/test/filters/apparmor.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/caps-join.exp b/test/filters/caps-join.exp
index 3e12d23bb..5b80b2b48 100755
--- a/test/filters/caps-join.exp
+++ b/test/filters/caps-join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/caps-print.exp b/test/filters/caps-print.exp
index d145d4d23..e78ab5275 100755
--- a/test/filters/caps-print.exp
+++ b/test/filters/caps-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/caps.exp b/test/filters/caps.exp
index 515da744f..b9aa8d22e 100755
--- a/test/filters/caps.exp
+++ b/test/filters/caps.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/debug.exp b/test/filters/debug.exp
index 25c499e6a..4a5a11639 100755
--- a/test/filters/debug.exp
+++ b/test/filters/debug.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index 6a8ce1f99..fba90522d 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/filters/fseccomp.exp b/test/filters/fseccomp.exp
index 70f85ccfa..c7062b395 100755
--- a/test/filters/fseccomp.exp
+++ b/test/filters/fseccomp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/memwrexe-32.exp b/test/filters/memwrexe-32.exp
index d012ada55..d7fad9091 100755
--- a/test/filters/memwrexe-32.exp
+++ b/test/filters/memwrexe-32.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/memwrexe.c b/test/filters/memwrexe.c
index 12787f3a5..797e7881d 100644
--- a/test/filters/memwrexe.c
+++ b/test/filters/memwrexe.c
@@ -1,3 +1,7 @@
+// This file is part of Firejail project
+// Copyright (C) 2014-2020 Firejail Authors
+// License GPL v2
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/test/filters/memwrexe.exp b/test/filters/memwrexe.exp
index d437d1ac5..244f2477f 100755
--- a/test/filters/memwrexe.exp
+++ b/test/filters/memwrexe.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/noroot.exp b/test/filters/noroot.exp
index 9b8d2e91c..e9f01443f 100755
--- a/test/filters/noroot.exp
+++ b/test/filters/noroot.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/protocol.exp b/test/filters/protocol.exp
index 8ff9bb7c9..0fecd645d 100755
--- a/test/filters/protocol.exp
+++ b/test/filters/protocol.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-bad-empty.exp b/test/filters/seccomp-bad-empty.exp
index c5efd09be..269ea1a40 100755
--- a/test/filters/seccomp-bad-empty.exp
+++ b/test/filters/seccomp-bad-empty.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-chmod-profile.exp b/test/filters/seccomp-chmod-profile.exp
index 19db2177f..9b61397ca 100755
--- a/test/filters/seccomp-chmod-profile.exp
+++ b/test/filters/seccomp-chmod-profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-chmod.exp b/test/filters/seccomp-chmod.exp
index f87c28691..01b9cbaac 100755
--- a/test/filters/seccomp-chmod.exp
+++ b/test/filters/seccomp-chmod.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-chown.exp b/test/filters/seccomp-chown.exp
index 934b572c6..f6094c965 100755
--- a/test/filters/seccomp-chown.exp
+++ b/test/filters/seccomp-chown.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-debug-32.exp b/test/filters/seccomp-debug-32.exp
index 990520424..08e590041 100755
--- a/test/filters/seccomp-debug-32.exp
+++ b/test/filters/seccomp-debug-32.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-debug.exp b/test/filters/seccomp-debug.exp
index dc4bf34f2..c3ba9c084 100755
--- a/test/filters/seccomp-debug.exp
+++ b/test/filters/seccomp-debug.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-dualfilter.exp b/test/filters/seccomp-dualfilter.exp
index 32efbdacf..b6204fc64 100755
--- a/test/filters/seccomp-dualfilter.exp
+++ b/test/filters/seccomp-dualfilter.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 1
diff --git a/test/filters/seccomp-empty.exp b/test/filters/seccomp-empty.exp
index 36f4bc53f..81411218f 100755
--- a/test/filters/seccomp-empty.exp
+++ b/test/filters/seccomp-empty.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-errno.exp b/test/filters/seccomp-errno.exp
index 1147c1060..d125a90dc 100755
--- a/test/filters/seccomp-errno.exp
+++ b/test/filters/seccomp-errno.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-join.exp b/test/filters/seccomp-join.exp
index f1d57238b..bb693e94d 100755
--- a/test/filters/seccomp-join.exp
+++ b/test/filters/seccomp-join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-numeric.exp b/test/filters/seccomp-numeric.exp
index 77f6d60b0..6e8402cfa 100755
--- a/test/filters/seccomp-numeric.exp
+++ b/test/filters/seccomp-numeric.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-postexec.exp b/test/filters/seccomp-postexec.exp
index 75a935575..164230482 100755
--- a/test/filters/seccomp-postexec.exp
+++ b/test/filters/seccomp-postexec.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-ptrace.exp b/test/filters/seccomp-ptrace.exp
index 64912a005..39cd6a393 100755
--- a/test/filters/seccomp-ptrace.exp
+++ b/test/filters/seccomp-ptrace.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-run-files.exp b/test/filters/seccomp-run-files.exp
index 3f4e506af..fd3033a69 100755
--- a/test/filters/seccomp-run-files.exp
+++ b/test/filters/seccomp-run-files.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/seccomp-su.exp b/test/filters/seccomp-su.exp
index 8417cadaf..6a3d99916 100755
--- a/test/filters/seccomp-su.exp
+++ b/test/filters/seccomp-su.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/filters/syscall_test.c b/test/filters/syscall_test.c
index 2005f2109..f153e8b3f 100644
--- a/test/filters/syscall_test.c
+++ b/test/filters/syscall_test.c
@@ -1,5 +1,5 @@
 // This file is part of Firejail project
-// Copyright (C) 2014-2019 Firejail Authors
+// Copyright (C) 2014-2020 Firejail Authors
 // License GPL v2
 #include <stdlib.h>
diff --git a/test/fnetfilter/cmdline.exp b/test/fnetfilter/cmdline.exp
index dcffba35b..944fcda52 100755
--- a/test/fnetfilter/cmdline.exp
+++ b/test/fnetfilter/cmdline.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fnetfilter/copy.exp b/test/fnetfilter/copy.exp
index c490c2fe2..4702a5d02 100755
--- a/test/fnetfilter/copy.exp
+++ b/test/fnetfilter/copy.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fnetfilter/default.exp b/test/fnetfilter/default.exp
index b059852b6..2b5bdbb69 100755
--- a/test/fnetfilter/default.exp
+++ b/test/fnetfilter/default.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fnetfilter/fnetfilter.sh b/test/fnetfilter/fnetfilter.sh
index a37931422..636a9d086 100755
--- a/test/fnetfilter/fnetfilter.sh
+++ b/test/fnetfilter/fnetfilter.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/fnetfilter/template.exp b/test/fnetfilter/template.exp
index 153c21f8a..03a8d6229 100755
--- a/test/fnetfilter/template.exp
+++ b/test/fnetfilter/template.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index 2509638fc..dd24f5922 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/fs/fs_dev_shm.exp b/test/fs/fs_dev_shm.exp
index afd13053e..5f1013339 100755
--- a/test/fs/fs_dev_shm.exp
+++ b/test/fs/fs_dev_shm.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fs_var_lock.exp b/test/fs/fs_var_lock.exp
index 45a2ca1a8..762027b5b 100755
--- a/test/fs/fs_var_lock.exp
+++ b/test/fs/fs_var_lock.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fs_var_tmp.exp b/test/fs/fs_var_tmp.exp
index 8c1cf10af..886e773d8 100755
--- a/test/fs/fs_var_tmp.exp
+++ b/test/fs/fs_var_tmp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/fscheck-bindnoroot.exp b/test/fs/fscheck-bindnoroot.exp
index 431092f05..eff8c4fad 100755
--- a/test/fs/fscheck-bindnoroot.exp
+++ b/test/fs/fscheck-bindnoroot.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/fscheck-private.exp b/test/fs/fscheck-private.exp
index 1972a683b..2cf985a9a 100755
--- a/test/fs/fscheck-private.exp
+++ b/test/fs/fscheck-private.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/fscheck-readonly.exp b/test/fs/fscheck-readonly.exp
index 4d7528e50..c591e4670 100755
--- a/test/fs/fscheck-readonly.exp
+++ b/test/fs/fscheck-readonly.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/fscheck-tmpfs.exp b/test/fs/fscheck-tmpfs.exp
index fa3971b4a..ebd3eeb9c 100755
--- a/test/fs/fscheck-tmpfs.exp
+++ b/test/fs/fscheck-tmpfs.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/invalid_filename.exp b/test/fs/invalid_filename.exp
index 4155e4ef5..bfefcec68 100755
--- a/test/fs/invalid_filename.exp
+++ b/test/fs/invalid_filename.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/kmsg.exp b/test/fs/kmsg.exp
index 253267299..8ae520836 100755
--- a/test/fs/kmsg.exp
+++ b/test/fs/kmsg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/macro.exp b/test/fs/macro.exp
index 31a80452b..fd9928222 100755
--- a/test/fs/macro.exp
+++ b/test/fs/macro.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/mkdir.exp b/test/fs/mkdir.exp
index 6685f4ee3..8a7ac9d97 100755
--- a/test/fs/mkdir.exp
+++ b/test/fs/mkdir.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 3
diff --git a/test/fs/mkdir_mkfile.exp b/test/fs/mkdir_mkfile.exp
index 680ae1178..109984035 100755
--- a/test/fs/mkdir_mkfile.exp
+++ b/test/fs/mkdir_mkfile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/noblacklist-blacklist-noexec.exp b/test/fs/noblacklist-blacklist-noexec.exp
index 5d0581a8c..31f5ab054 100755
--- a/test/fs/noblacklist-blacklist-noexec.exp
+++ b/test/fs/noblacklist-blacklist-noexec.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/noblacklist-blacklist-readonly.exp b/test/fs/noblacklist-blacklist-readonly.exp
index c31bd6948..367d835b0 100755
--- a/test/fs/noblacklist-blacklist-readonly.exp
+++ b/test/fs/noblacklist-blacklist-readonly.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/option_bind_user.exp b/test/fs/option_bind_user.exp
index 7ec55d82f..f74d4e994 100755
--- a/test/fs/option_bind_user.exp
+++ b/test/fs/option_bind_user.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/option_blacklist.exp b/test/fs/option_blacklist.exp
index b3f7497cd..f703c0f79 100755
--- a/test/fs/option_blacklist.exp
+++ b/test/fs/option_blacklist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/option_blacklist_file.exp b/test/fs/option_blacklist_file.exp
index 6f789a792..3c2a6c3df 100755
--- a/test/fs/option_blacklist_file.exp
+++ b/test/fs/option_blacklist_file.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/option_blacklist_glob.exp b/test/fs/option_blacklist_glob.exp
index cf6709322..8afdeff5f 100755
--- a/test/fs/option_blacklist_glob.exp
+++ b/test/fs/option_blacklist_glob.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-bin.exp b/test/fs/private-bin.exp
index d432b3b87..3f74a196f 100755
--- a/test/fs/private-bin.exp
+++ b/test/fs/private-bin.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-cache.exp b/test/fs/private-cache.exp
index ddff2d02d..0597e8921 100755
--- a/test/fs/private-cache.exp
+++ b/test/fs/private-cache.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/private-cwd.exp b/test/fs/private-cwd.exp
index 0fa87a92f..d439e2c1e 100755
--- a/test/fs/private-cwd.exp
+++ b/test/fs/private-cwd.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-etc-empty.exp b/test/fs/private-etc-empty.exp
index db8810da1..f6c5405bf 100755
--- a/test/fs/private-etc-empty.exp
+++ b/test/fs/private-etc-empty.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-etc.exp b/test/fs/private-etc.exp
index 83f95dc5c..e727eee5c 100755
--- a/test/fs/private-etc.exp
+++ b/test/fs/private-etc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-home-dir.exp b/test/fs/private-home-dir.exp
index af93d021d..bf4296010 100755
--- a/test/fs/private-home-dir.exp
+++ b/test/fs/private-home-dir.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-home.exp b/test/fs/private-home.exp
index 2c5831f40..a46071b3a 100755
--- a/test/fs/private-home.exp
+++ b/test/fs/private-home.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-homedir.exp b/test/fs/private-homedir.exp
index ba815b332..36d61786e 100755
--- a/test/fs/private-homedir.exp
+++ b/test/fs/private-homedir.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private-lib.exp b/test/fs/private-lib.exp
index 777424ebe..ed04de1f9 100755
--- a/test/fs/private-lib.exp
+++ b/test/fs/private-lib.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
diff --git a/test/fs/private-whitelist.exp b/test/fs/private-whitelist.exp
index 67c75355a..c988bce7f 100755
--- a/test/fs/private-whitelist.exp
+++ b/test/fs/private-whitelist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/private.exp b/test/fs/private.exp
index a16acc6e6..e59f64085 100755
--- a/test/fs/private.exp
+++ b/test/fs/private.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/read-write.exp b/test/fs/read-write.exp
index a2c397a43..2ff4cda7c 100755
--- a/test/fs/read-write.exp
+++ b/test/fs/read-write.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/sys_fs.exp b/test/fs/sys_fs.exp
index ba002fe91..60e935a4c 100755
--- a/test/fs/sys_fs.exp
+++ b/test/fs/sys_fs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-dev.exp b/test/fs/whitelist-dev.exp
index 09448e03a..0db5b571c 100755
--- a/test/fs/whitelist-dev.exp
+++ b/test/fs/whitelist-dev.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
@@ -49,6 +49,8 @@ sleep 1
 send -- "ls /dev | wc -l\r"
 expect {
        timeout {puts "TESTING ERROR 5\n";exit}
+        "10" {puts "OK\n"}
+        "11" {puts "OK\n"}
        "12" {puts "OK\n"}
        "13" {puts "OK\n"}
        "14" {puts "OK\n"}
diff --git a/test/fs/whitelist-double.exp b/test/fs/whitelist-double.exp
index a983099ac..90cfbaf11 100755
--- a/test/fs/whitelist-double.exp
+++ b/test/fs/whitelist-double.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-empty.exp b/test/fs/whitelist-empty.exp
index bc0c13688..c4810963f 100755
--- a/test/fs/whitelist-empty.exp
+++ b/test/fs/whitelist-empty.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 30
diff --git a/test/fs/whitelist-noexec.exp b/test/fs/whitelist-noexec.exp
index f05316a30..ee601c12d 100755
--- a/test/fs/whitelist-noexec.exp
+++ b/test/fs/whitelist-noexec.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-readonly.exp b/test/fs/whitelist-readonly.exp
index 784fc36bd..0e5794a17 100755
--- a/test/fs/whitelist-readonly.exp
+++ b/test/fs/whitelist-readonly.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/fs/whitelist-whitespace.exp b/test/fs/whitelist-whitespace.exp
index 959fb9409..9534568c4 100755
--- a/test/fs/whitelist-whitespace.exp
+++ b/test/fs/whitelist-whitespace.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/fs/whitelist.exp b/test/fs/whitelist.exp
index 8553ad94a..11dfa98c8 100755
--- a/test/fs/whitelist.exp
+++ b/test/fs/whitelist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/4bridges_arp.exp b/test/network/4bridges_arp.exp
index d96d4e497..4e191ffd6 100755
--- a/test/network/4bridges_arp.exp
+++ b/test/network/4bridges_arp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/4bridges_ip.exp b/test/network/4bridges_ip.exp
index cd4d88de9..a613b3e54 100755
--- a/test/network/4bridges_ip.exp
+++ b/test/network/4bridges_ip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/bandwidth.exp b/test/network/bandwidth.exp
index de812b602..b8497d936 100755
--- a/test/network/bandwidth.exp
+++ b/test/network/bandwidth.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/configure b/test/network/configure
index 5220f838a..64d098931 100755
--- a/test/network/configure
+++ b/test/network/configure
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 brctl addbr br0
diff --git a/test/network/dns-print.exp b/test/network/dns-print.exp
index 9cdc14a6d..a002daeca 100755
--- a/test/network/dns-print.exp
+++ b/test/network/dns-print.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/network/firemon-arp.exp b/test/network/firemon-arp.exp
index 71fa1660f..70d129165 100755
--- a/test/network/firemon-arp.exp
+++ b/test/network/firemon-arp.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/network/firemon-interfaces.exp b/test/network/firemon-interfaces.exp
index f628f2daa..17b9f7535 100755
--- a/test/network/firemon-interfaces.exp
+++ b/test/network/firemon-interfaces.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/firemon-route.exp b/test/network/firemon-route.exp
index 19a705778..fe2f5a952 100755
--- a/test/network/firemon-route.exp
+++ b/test/network/firemon-route.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/network/hostname.exp b/test/network/hostname.exp
index 748404e30..205ae8078 100755
--- a/test/network/hostname.exp
+++ b/test/network/hostname.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/interface.exp b/test/network/interface.exp
index f631b805b..35b22daaf 100755
--- a/test/network/interface.exp
+++ b/test/network/interface.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 #
 # interface
 #
diff --git a/test/network/ip6.exp b/test/network/ip6.exp
index e4da3a8a6..e1583c22f 100755
--- a/test/network/ip6.exp
+++ b/test/network/ip6.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/iprange.exp b/test/network/iprange.exp
index 1d360599d..5d270166f 100755
--- a/test/network/iprange.exp
+++ b/test/network/iprange.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_arp.exp b/test/network/net_arp.exp
index 57a30bf6a..5b170bad5 100755
--- a/test/network/net_arp.exp
+++ b/test/network/net_arp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_badip.exp b/test/network/net_badip.exp
index f844885f9..4e20f9040 100755
--- a/test/network/net_badip.exp
+++ b/test/network/net_badip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_defaultgw.exp b/test/network/net_defaultgw.exp
index fad4f52aa..9093c7ad4 100755
--- a/test/network/net_defaultgw.exp
+++ b/test/network/net_defaultgw.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_defaultgw2.exp b/test/network/net_defaultgw2.exp
index 163a2caf3..3ecb1cb51 100755
--- a/test/network/net_defaultgw2.exp
+++ b/test/network/net_defaultgw2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_defaultgw3.exp b/test/network/net_defaultgw3.exp
index bee80d818..fe745d326 100755
--- a/test/network/net_defaultgw3.exp
+++ b/test/network/net_defaultgw3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_ip.exp b/test/network/net_ip.exp
index d51dec994..e67dfd587 100755
--- a/test/network/net_ip.exp
+++ b/test/network/net_ip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_local.exp b/test/network/net_local.exp
index 0ce648c0b..c1794f200 100755
--- a/test/network/net_local.exp
+++ b/test/network/net_local.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_mac.exp b/test/network/net_mac.exp
index 55962ac65..d62a78e39 100755
--- a/test/network/net_mac.exp
+++ b/test/network/net_mac.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_macvlan2.exp b/test/network/net_macvlan2.exp
index 5a347ed5d..80c85a788 100755
--- a/test/network/net_macvlan2.exp
+++ b/test/network/net_macvlan2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_mtu.exp b/test/network/net_mtu.exp
index c5f74b5d3..19a488376 100755
--- a/test/network/net_mtu.exp
+++ b/test/network/net_mtu.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_netfilter.exp b/test/network/net_netfilter.exp
index 1a04212ca..bce067c43 100755
--- a/test/network/net_netfilter.exp
+++ b/test/network/net_netfilter.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_noip.exp b/test/network/net_noip.exp
index ee0930e01..46ef6f9fb 100755
--- a/test/network/net_noip.exp
+++ b/test/network/net_noip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_noip2.exp b/test/network/net_noip2.exp
index d33280047..579661fbc 100755
--- a/test/network/net_noip2.exp
+++ b/test/network/net_noip2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_none.exp b/test/network/net_none.exp
index ba0722032..6ec4187d3 100755
--- a/test/network/net_none.exp
+++ b/test/network/net_none.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_profile.exp b/test/network/net_profile.exp
index cc7a3ee53..f31527984 100755
--- a/test/network/net_profile.exp
+++ b/test/network/net_profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_scan.exp b/test/network/net_scan.exp
index 8da1031d9..6cd3804be 100755
--- a/test/network/net_scan.exp
+++ b/test/network/net_scan.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_unconfigured.exp b/test/network/net_unconfigured.exp
index f66469e5f..349d4c042 100755
--- a/test/network/net_unconfigured.exp
+++ b/test/network/net_unconfigured.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/net_veth.exp b/test/network/net_veth.exp
index eb140fb9c..ada2d7bd9 100755
--- a/test/network/net_veth.exp
+++ b/test/network/net_veth.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/netfilter-template.exp b/test/network/netfilter-template.exp
index 2801b4e06..72dfa1653 100755
--- a/test/network/netfilter-template.exp
+++ b/test/network/netfilter-template.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/netns.exp b/test/network/netns.exp
index 53a3d3dac..cec3151ef 100755
--- a/test/network/netns.exp
+++ b/test/network/netns.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/netstats.exp b/test/network/netstats.exp
index 1a3b55108..4b47c389d 100755
--- a/test/network/netstats.exp
+++ b/test/network/netstats.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/network/network.sh b/test/network/network.sh
index c8ff3f1e1..a216f5563 100755
--- a/test/network/network.sh
+++ b/test/network/network.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/network/tcpserver.c b/test/network/tcpserver.c
index 9de965858..f7f8a41bc 100644
--- a/test/network/tcpserver.c
+++ b/test/network/tcpserver.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2019 Firejail Authors
+ * Copyright (C) 2014-2020 Firejail Authors
 *
 * This file is part of firejail project
 *
diff --git a/test/network/veth-name.exp b/test/network/veth-name.exp
index 8d065da9f..4ad5f868c 100755
--- a/test/network/veth-name.exp
+++ b/test/network/veth-name.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/firefox-x11-xorg.exp b/test/overlay/firefox-x11-xorg.exp
index 8a02eb8eb..395a91a1f 100755
--- a/test/overlay/firefox-x11-xorg.exp
+++ b/test/overlay/firefox-x11-xorg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/firefox-x11.exp b/test/overlay/firefox-x11.exp
index b2fa5cfdc..1b3f779bb 100755
--- a/test/overlay/firefox-x11.exp
+++ b/test/overlay/firefox-x11.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/firefox.exp b/test/overlay/firefox.exp
index b0e2fd561..fd3c73d32 100755
--- a/test/overlay/firefox.exp
+++ b/test/overlay/firefox.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/overlay/fs-named.exp b/test/overlay/fs-named.exp
index 0356720bc..abfddabc3 100755
--- a/test/overlay/fs-named.exp
+++ b/test/overlay/fs-named.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/overlay/fs-tmpfs.exp b/test/overlay/fs-tmpfs.exp
index 20fa315b6..130159ad0 100755
--- a/test/overlay/fs-tmpfs.exp
+++ b/test/overlay/fs-tmpfs.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/overlay/fs.exp b/test/overlay/fs.exp
index 9debe6536..f8c8150d3 100755
--- a/test/overlay/fs.exp
+++ b/test/overlay/fs.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh
index bedd66a87..3d4ec06d4 100755
--- a/test/overlay/overlay.sh
+++ b/test/overlay/overlay.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/private-lib/atril.exp b/test/private-lib/atril.exp
index 391dc09b3..effdf0b7f 100755
--- a/test/private-lib/atril.exp
+++ b/test/private-lib/atril.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/dig.exp b/test/private-lib/dig.exp
index 2d997076b..a15d5e44a 100755
--- a/test/private-lib/dig.exp
+++ b/test/private-lib/dig.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/eog.exp b/test/private-lib/eog.exp
index 3a4b403a0..85f9b3e3d 100755
--- a/test/private-lib/eog.exp
+++ b/test/private-lib/eog.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/eom.exp b/test/private-lib/eom.exp
index cd6bfadb5..a8caf1b01 100755
--- a/test/private-lib/eom.exp
+++ b/test/private-lib/eom.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/evince.exp b/test/private-lib/evince.exp
index 32538c338..184d9e6e6 100755
--- a/test/private-lib/evince.exp
+++ b/test/private-lib/evince.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/galculator.exp b/test/private-lib/galculator.exp
index 3ff0b6111..2fc05772e 100755
--- a/test/private-lib/galculator.exp
+++ b/test/private-lib/galculator.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gedit.exp b/test/private-lib/gedit.exp
index 90eb9a5c0..00ecfb184 100755
--- a/test/private-lib/gedit.exp
+++ b/test/private-lib/gedit.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-calculator.exp b/test/private-lib/gnome-calculator.exp
index 3ec484e05..31c139738 100755
--- a/test/private-lib/gnome-calculator.exp
+++ b/test/private-lib/gnome-calculator.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-logs.exp b/test/private-lib/gnome-logs.exp
index ecec5b50c..c143f5c99 100755
--- a/test/private-lib/gnome-logs.exp
+++ b/test/private-lib/gnome-logs.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-nettool.exp b/test/private-lib/gnome-nettool.exp
index 6e6e0395b..09841c4a8 100755
--- a/test/private-lib/gnome-nettool.exp
+++ b/test/private-lib/gnome-nettool.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gnome-system-log.exp b/test/private-lib/gnome-system-log.exp
index bdc09b8bc..3a81cff8f 100755
--- a/test/private-lib/gnome-system-log.exp
+++ b/test/private-lib/gnome-system-log.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/gpicview.exp b/test/private-lib/gpicview.exp
index b01df4cbf..cb8b2b040 100755
--- a/test/private-lib/gpicview.exp
+++ b/test/private-lib/gpicview.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/leafpad.exp b/test/private-lib/leafpad.exp
index 7a4dcd86e..9ef36641a 100755
--- a/test/private-lib/leafpad.exp
+++ b/test/private-lib/leafpad.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/mousepad.exp b/test/private-lib/mousepad.exp
index 0a69ae432..3bd0f4b77 100755
--- a/test/private-lib/mousepad.exp
+++ b/test/private-lib/mousepad.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/pavucontrol.exp b/test/private-lib/pavucontrol.exp
index ade658d51..078c29592 100755
--- a/test/private-lib/pavucontrol.exp
+++ b/test/private-lib/pavucontrol.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/pluma.exp b/test/private-lib/pluma.exp
index 4ba95353c..ac274cbfc 100755
--- a/test/private-lib/pluma.exp
+++ b/test/private-lib/pluma.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh
index 6a5588d5b..724fa4303 100755
--- a/test/private-lib/private-lib.sh
+++ b/test/private-lib/private-lib.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3g
diff --git a/test/private-lib/transmission-gtk.exp b/test/private-lib/transmission-gtk.exp
index 394e2a58e..1d4b4193e 100755
--- a/test/private-lib/transmission-gtk.exp
+++ b/test/private-lib/transmission-gtk.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/whois.exp b/test/private-lib/whois.exp
index a15a63569..19cd55d16 100755
--- a/test/private-lib/whois.exp
+++ b/test/private-lib/whois.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/private-lib/xcalc.exp b/test/private-lib/xcalc.exp
index 768d01773..46d8903ae 100755
--- a/test/private-lib/xcalc.exp
+++ b/test/private-lib/xcalc.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/conditional.exp b/test/profiles/conditional.exp
index e124f22cd..fc84581c2 100755
--- a/test/profiles/conditional.exp
+++ b/test/profiles/conditional.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/ignore.exp b/test/profiles/ignore.exp
index 0b5d92b70..7c065ef5c 100755
--- a/test/profiles/ignore.exp
+++ b/test/profiles/ignore.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_appname.exp b/test/profiles/profile_appname.exp
index aadb86975..1148fd764 100755
--- a/test/profiles/profile_appname.exp
+++ b/test/profiles/profile_appname.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_followlnk.exp b/test/profiles/profile_followlnk.exp
index eb3d04852..272f4437d 100755
--- a/test/profiles/profile_followlnk.exp
+++ b/test/profiles/profile_followlnk.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/profiles/profile_noperm.exp b/test/profiles/profile_noperm.exp
index 9f8cb54e2..d5f29b0ee 100755
--- a/test/profiles/profile_noperm.exp
+++ b/test/profiles/profile_noperm.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/profiles/profile_readonly.exp b/test/profiles/profile_readonly.exp
index c1c9544a6..57f1a61a6 100755
--- a/test/profiles/profile_readonly.exp
+++ b/test/profiles/profile_readonly.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/profiles/profile_recursivity.exp b/test/profiles/profile_recursivity.exp
index 0485573a1..22a97c96c 100755
--- a/test/profiles/profile_recursivity.exp
+++ b/test/profiles/profile_recursivity.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_syntax.exp b/test/profiles/profile_syntax.exp
index fc9a8f1c8..8d4b13f74 100755
--- a/test/profiles/profile_syntax.exp
+++ b/test/profiles/profile_syntax.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profile_syntax2.exp b/test/profiles/profile_syntax2.exp
index 74dcd429a..c0d0656da 100755
--- a/test/profiles/profile_syntax2.exp
+++ b/test/profiles/profile_syntax2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index 52ee74234..69f0dc086 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/profiles/test-profile.exp b/test/profiles/test-profile.exp
index 7b552a1ca..51f87d51d 100755
--- a/test/profiles/test-profile.exp
+++ b/test/profiles/test-profile.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/profiles/test.profile b/test/profiles/test.profile
index 1d69cc960..26d6de849 100644
--- a/test/profiles/test.profile
+++ b/test/profiles/test.profile
@@ -1,5 +1,5 @@
-   blacklist /sbin/iptables
+blacklist /sbin/iptables
-blacklist                /etc/shadow
+blacklist /etc/shadow
-        blacklist               /bin/rmdir
+blacklist /bin/rmdir
 blacklist ${PATH}/umount
 blacklist ${PATH}/mount
diff --git a/test/root/apache2.exp b/test/root/apache2.exp
index 88678d666..4d2379325 100755
--- a/test/root/apache2.exp
+++ b/test/root/apache2.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 5
 spawn $env(SHELL)
diff --git a/test/root/cgroup.exp b/test/root/cgroup.exp
index 06e2448e4..3b7db5139 100755
--- a/test/root/cgroup.exp
+++ b/test/root/cgroup.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/checkcfg.exp b/test/root/checkcfg.exp
index 5c5dcc055..ff40035e3 100755
--- a/test/root/checkcfg.exp
+++ b/test/root/checkcfg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/firecfg.exp b/test/root/firecfg.exp
index 872365570..b182eee13 100755
--- a/test/root/firecfg.exp
+++ b/test/root/firecfg.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/firemon-events.exp b/test/root/firemon-events.exp
index 8f6dd583b..398342566 100755
--- a/test/root/firemon-events.exp
+++ b/test/root/firemon-events.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/root/isc-dhcp.exp b/test/root/isc-dhcp.exp
index 24243d6bb..13177d383 100755
--- a/test/root/isc-dhcp.exp
+++ b/test/root/isc-dhcp.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 5
 spawn $env(SHELL)
diff --git a/test/root/join.exp b/test/root/join.exp
index 54a86a8f0..c9b9de110 100755
--- a/test/root/join.exp
+++ b/test/root/join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/login_nobody.exp b/test/root/login_nobody.exp
index 7f5294af8..448b0957a 100755
--- a/test/root/login_nobody.exp
+++ b/test/root/login_nobody.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/nginx.exp b/test/root/nginx.exp
index b98b50af6..5db6a4573 100755
--- a/test/root/nginx.exp
+++ b/test/root/nginx.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 5
 spawn $env(SHELL)
diff --git a/test/root/option_bind_directory.exp b/test/root/option_bind_directory.exp
index 2156c7dfa..1df318be1 100755
--- a/test/root/option_bind_directory.exp
+++ b/test/root/option_bind_directory.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/root/option_bind_file.exp b/test/root/option_bind_file.exp
index 107d8bccb..9631ae39d 100755
--- a/test/root/option_bind_file.exp
+++ b/test/root/option_bind_file.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/root/option_tmpfs.exp b/test/root/option_tmpfs.exp
index cac692cb2..ab0a9f0f1 100755
--- a/test/root/option_tmpfs.exp
+++ b/test/root/option_tmpfs.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/root/private.exp b/test/root/private.exp
index 3e93683ba..ef4cf2ee2 100755
--- a/test/root/private.exp
+++ b/test/root/private.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/profile_tmpfs.exp b/test/root/profile_tmpfs.exp
index bcb632c20..c56b827e4 100755
--- a/test/root/profile_tmpfs.exp
+++ b/test/root/profile_tmpfs.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/root/root.sh b/test/root/root.sh
index 363865fad..0c88e67d1 100755
--- a/test/root/root.sh
+++ b/test/root/root.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 # set a new firejail config file
 #cp firejail.config /etc/firejail/firejail.config
diff --git a/test/root/seccomp-chmod.exp b/test/root/seccomp-chmod.exp
index ac8f9121b..219c8cf60 100755
--- a/test/root/seccomp-chmod.exp
+++ b/test/root/seccomp-chmod.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/seccomp-chown.exp b/test/root/seccomp-chown.exp
index 9b8fe05ef..80d3eb92e 100755
--- a/test/root/seccomp-chown.exp
+++ b/test/root/seccomp-chown.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/seccomp-umount.exp b/test/root/seccomp-umount.exp
index 706fa6d00..37ae71736 100755
--- a/test/root/seccomp-umount.exp
+++ b/test/root/seccomp-umount.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/root/snmpd.exp b/test/root/snmpd.exp
index 610fdb13a..7e6deca04 100755
--- a/test/root/snmpd.exp
+++ b/test/root/snmpd.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 5
 spawn $env(SHELL)
diff --git a/test/root/unbound.exp b/test/root/unbound.exp
index 9c496306a..87d840323 100755
--- a/test/root/unbound.exp
+++ b/test/root/unbound.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 5
 spawn $env(SHELL)
diff --git a/test/root/whitelist.exp b/test/root/whitelist.exp
index 51611bda2..e5bcaac24 100755
--- a/test/root/whitelist.exp
+++ b/test/root/whitelist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/ssh/login.exp b/test/ssh/login.exp
index 479292c91..67667576e 100755
--- a/test/ssh/login.exp
+++ b/test/ssh/login.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/ssh/scp.exp b/test/ssh/scp.exp
index 355125751..a6583545c 100755
--- a/test/ssh/scp.exp
+++ b/test/ssh/scp.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/ssh/sftp.exp b/test/ssh/sftp.exp
index 3b0124ec7..0d9792de8 100755
--- a/test/ssh/sftp.exp
+++ b/test/ssh/sftp.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/ssh/ssh.sh b/test/ssh/ssh.sh
index e7de1babd..77dc89f2f 100755
--- a/test/ssh/ssh.sh
+++ b/test/ssh/ssh.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/stress/blacklist.exp b/test/stress/blacklist.exp
index 5ea39779d..149f8f3df 100755
--- a/test/stress/blacklist.exp
+++ b/test/stress/blacklist.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/stress/env.exp b/test/stress/env.exp
index 85c9e4bf6..2ac0c6226 100755
--- a/test/stress/env.exp
+++ b/test/stress/env.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/stress/net_macvlan.exp b/test/stress/net_macvlan.exp
index 7a732bf48..b8d192d2c 100755
--- a/test/stress/net_macvlan.exp
+++ b/test/stress/net_macvlan.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/stress/stress.sh b/test/stress/stress.sh
index 6853c5a13..f3488a0cf 100755
--- a/test/stress/stress.sh
+++ b/test/stress/stress.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/sysutils/cpio.exp b/test/sysutils/cpio.exp
index 9d13b4e44..1d0d43543 100755
--- a/test/sysutils/cpio.exp
+++ b/test/sysutils/cpio.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/file.exp b/test/sysutils/file.exp
index f530dc152..74d5c3064 100755
--- a/test/sysutils/file.exp
+++ b/test/sysutils/file.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/gzip.exp b/test/sysutils/gzip.exp
index 38313fd11..d81b78aba 100755
--- a/test/sysutils/gzip.exp
+++ b/test/sysutils/gzip.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/less.exp b/test/sysutils/less.exp
index 436abfc2b..2bfb60302 100755
--- a/test/sysutils/less.exp
+++ b/test/sysutils/less.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/ping.exp b/test/sysutils/ping.exp
index d92aaa44f..58bcb6111 100755
--- a/test/sysutils/ping.exp
+++ b/test/sysutils/ping.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/strings.exp b/test/sysutils/strings.exp
index 0be00fc7c..2b6c3848a 100755
--- a/test/sysutils/strings.exp
+++ b/test/sysutils/strings.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index 3f5ed33cb..fe931b045 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/sysutils/tar.exp b/test/sysutils/tar.exp
index 29e156acd..4ed7bace4 100755
--- a/test/sysutils/tar.exp
+++ b/test/sysutils/tar.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/xz.exp b/test/sysutils/xz.exp
index 93c83e814..63b1ad3c7 100755
--- a/test/sysutils/xz.exp
+++ b/test/sysutils/xz.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/sysutils/xzdec.exp b/test/sysutils/xzdec.exp
index 6fec59d58..02621bbf0 100755
--- a/test/sysutils/xzdec.exp
+++ b/test/sysutils/xzdec.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/audit.exp b/test/utils/audit.exp
index 15400da31..6ce763e3f 100755
--- a/test/utils/audit.exp
+++ b/test/utils/audit.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/build.exp b/test/utils/build.exp
index 44b73179c..ae46ffa6e 100755
--- a/test/utils/build.exp
+++ b/test/utils/build.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/caps-print.exp b/test/utils/caps-print.exp
index bfa88f3de..753511536 100755
--- a/test/utils/caps-print.exp
+++ b/test/utils/caps-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/catchsignal-master.sh b/test/utils/catchsignal-master.sh
index 62a1801cc..e8a5205bb 100755
--- a/test/utils/catchsignal-master.sh
+++ b/test/utils/catchsignal-master.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 ./catchsignal.sh &
 ./catchsignal.sh &
diff --git a/test/utils/catchsignal.sh b/test/utils/catchsignal.sh
index 87a1d0adf..de2c068b3 100755
--- a/test/utils/catchsignal.sh
+++ b/test/utils/catchsignal.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 _term() {
  echo "Caught Signal"
diff --git a/test/utils/catchsignal2.sh b/test/utils/catchsignal2.sh
index 424350397..6499972d8 100755
--- a/test/utils/catchsignal2.sh
+++ b/test/utils/catchsignal2.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 _term() {
  echo "Caught Signal"
diff --git a/test/utils/command.exp b/test/utils/command.exp
index a55d5436c..a2f7e4204 100755
--- a/test/utils/command.exp
+++ b/test/utils/command.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/cpu-print.exp b/test/utils/cpu-print.exp
index 311a031f8..8b3b51dba 100755
--- a/test/utils/cpu-print.exp
+++ b/test/utils/cpu-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/dns-print.exp b/test/utils/dns-print.exp
index be55d3db2..edbe66a51 100755
--- a/test/utils/dns-print.exp
+++ b/test/utils/dns-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-caps.exp b/test/utils/firemon-caps.exp
index ec92a0383..a51e5a765 100755
--- a/test/utils/firemon-caps.exp
+++ b/test/utils/firemon-caps.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-cgroup.exp b/test/utils/firemon-cgroup.exp
index 91a1eb891..f7c6e0adb 100755
--- a/test/utils/firemon-cgroup.exp
+++ b/test/utils/firemon-cgroup.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-cpu.exp b/test/utils/firemon-cpu.exp
index eb98993f9..90bb702a3 100755
--- a/test/utils/firemon-cpu.exp
+++ b/test/utils/firemon-cpu.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-interface.exp b/test/utils/firemon-interface.exp
index ba3ecf9ac..ff3cea8bb 100755
--- a/test/utils/firemon-interface.exp
+++ b/test/utils/firemon-interface.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-name.exp b/test/utils/firemon-name.exp
index 883c516fc..88e41d96d 100755
--- a/test/utils/firemon-name.exp
+++ b/test/utils/firemon-name.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-seccomp.exp b/test/utils/firemon-seccomp.exp
index db5ea7d8a..a8c7fc24d 100755
--- a/test/utils/firemon-seccomp.exp
+++ b/test/utils/firemon-seccomp.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/firemon-version.exp b/test/utils/firemon-version.exp
index e1bb3e931..837bf0f92 100755
--- a/test/utils/firemon-version.exp
+++ b/test/utils/firemon-version.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/fs-print.exp b/test/utils/fs-print.exp
index 20153829d..736c309ec 100755
--- a/test/utils/fs-print.exp
+++ b/test/utils/fs-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/help.exp b/test/utils/help.exp
index 0105c74f4..77c2e6ec3 100755
--- a/test/utils/help.exp
+++ b/test/utils/help.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join-profile.exp b/test/utils/join-profile.exp
index 716bd2947..b44f44cfe 100755
--- a/test/utils/join-profile.exp
+++ b/test/utils/join-profile.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/utils/join.exp b/test/utils/join.exp
index 1d2ad2a26..1f1a905b2 100755
--- a/test/utils/join.exp
+++ b/test/utils/join.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join2.exp b/test/utils/join2.exp
index ea40a80b3..6c26db4e9 100755
--- a/test/utils/join2.exp
+++ b/test/utils/join2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join3.exp b/test/utils/join3.exp
index eeb5ccc30..74dad7070 100755
--- a/test/utils/join3.exp
+++ b/test/utils/join3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/join4.exp b/test/utils/join4.exp
index 80dcae93a..d04cbee46 100755
--- a/test/utils/join4.exp
+++ b/test/utils/join4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/list.exp b/test/utils/list.exp
index 82f6324e5..fefdd4787 100755
--- a/test/utils/list.exp
+++ b/test/utils/list.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/ls.exp b/test/utils/ls.exp
index ff6867c51..b70f53a74 100755
--- a/test/utils/ls.exp
+++ b/test/utils/ls.exp
@@ -1,4 +1,7 @@
 #!/usr/bin/expect -f
+# This file is part of Firejail project
+# Copyright (C) 2014-2020 Firejail Authors
+# License GPL v2
 set timeout 10
 spawn $env(SHELL)
diff --git a/test/utils/man.exp b/test/utils/man.exp
index da2a8a565..3cde9f2c8 100755
--- a/test/utils/man.exp
+++ b/test/utils/man.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/name.exp b/test/utils/name.exp
index 456f55252..3a1dfb640 100755
--- a/test/utils/name.exp
+++ b/test/utils/name.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/profile_print.exp b/test/utils/profile_print.exp
index 83faaf74d..ddeeb8af6 100755
--- a/test/utils/profile_print.exp
+++ b/test/utils/profile_print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/protocol-print.exp b/test/utils/protocol-print.exp
index fb181f564..c44a659e1 100755
--- a/test/utils/protocol-print.exp
+++ b/test/utils/protocol-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/seccomp-print.exp b/test/utils/seccomp-print.exp
index 2dc4a8287..41a6ce778 100755
--- a/test/utils/seccomp-print.exp
+++ b/test/utils/seccomp-print.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/shutdown.exp b/test/utils/shutdown.exp
index 0d5ec5d63..0f6cab8bb 100755
--- a/test/utils/shutdown.exp
+++ b/test/utils/shutdown.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/shutdown2.exp b/test/utils/shutdown2.exp
index a07241340..463c2fb78 100755
--- a/test/utils/shutdown2.exp
+++ b/test/utils/shutdown2.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/shutdown3.exp b/test/utils/shutdown3.exp
index 847e63706..9e92889dc 100755
--- a/test/utils/shutdown3.exp
+++ b/test/utils/shutdown3.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/shutdown4.exp b/test/utils/shutdown4.exp
index 3d4f718cb..e7733ca41 100755
--- a/test/utils/shutdown4.exp
+++ b/test/utils/shutdown4.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/top.exp b/test/utils/top.exp
index 3faf69080..2ef6f0375 100755
--- a/test/utils/top.exp
+++ b/test/utils/top.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/trace.exp b/test/utils/trace.exp
index 1b6db17be..5df44c1ca 100755
--- a/test/utils/trace.exp
+++ b/test/utils/trace.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 30
diff --git a/test/utils/tree.exp b/test/utils/tree.exp
index 09eb29029..82045e8c9 100755
--- a/test/utils/tree.exp
+++ b/test/utils/tree.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index b5b90a22d..82ccc82bb 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 export MALLOC_CHECK_=3
diff --git a/test/utils/version.exp b/test/utils/version.exp
index aad3b72e0..c78a087bb 100755
--- a/test/utils/version.exp
+++ b/test/utils/version.exp
@@ -1,6 +1,6 @@
 #!/usr/bin/expect -f
 # This file is part of Firejail project
-# Copyright (C) 2014-2019 Firejail Authors
+# Copyright (C) 2014-2020 Firejail Authors
 # License GPL v2
 set timeout 10