59 files changed, 799 insertions, 1285 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 0c9701d1c..e380ed26a 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,4 +1,35 @@
-# move whitelist/blacklist to allow/deny
+# Note: Entries (and sections) should be listed in topological order (that is,
-fe0f975f447d59977d90c3226cc8c623b31b20b3
+# in the same order that is shown by `git log --oneline`) and they can be
-# Revert "move whitelist/blacklist to allow/deny"
+# generated with one of the following commands:
-f43382f1e9707b4fd5e63c7bfe881912aa4ee994
+#
+# TZ=UTC0 git show --date='format-local:%Y-%m-%d' --pretty='%H # %cd | %s' -s
+#   [<commit>...]
+#
+# TZ=UTC0 git log --date='format-local:%Y-%m-%d' --pretty='%H # %cd | %s'
+#   [<revision-range>]
+# Landlock v1
+97874c3bf923798b0e3ab119d169aaa9b1314221 # 2022-09-05 | Revert "Merge pull request #5315 from ChrysoliteAzalea/landlock"
+b900bdc87463d79568aef46cb7e3b373fbff84b1 # 2022-09-05 | Revert "compile fix"
+bfcacff665b750ae7b9fc984496df26fcd7cc53d # 2022-09-05 | Revert "tracelog disabled by default in /etc/firejail/firejail.config file"
+2a79f3a2689711e6151187063bb55a6af3160b6f # 2022-09-05 | Revert "README/README.md"
+67348ac9c2cdf9d30efbf9fd13eaf0a4adc3be00 # 2022-09-05 | Revert "typos"
+0cd20b7e81a7815f57055b38f0746ef14fed2cd0 # 2022-09-05 | Revert "fix syntax in configure.ac"
+26c74796f3c76b8f0ea0b95a863eb707ecced195 # 2022-09-05 | Revert "landlock: check for landlock support in glibc"
+5b206611c01e42a6d63c596be45bcf085832b035 # 2022-09-05 | Revert "landlock: support in firejail --version"
+2f3c19a87dd49b220f69f27f8c14c627277355d6 # 2022-09-04 | landlock: support in firejail --version
+c5a052ffa4e2ccaf240635db116a49986808a2b6 # 2022-09-04 | landlock: check for landlock support in glibc
+2d885e5a091f847d7c2128506947b0f67dd2edab # 2022-09-04 | fix syntax in configure.ac
+0594c5d3d0f1ddc4049cf2ed38676a1cdc8d6843 # 2022-08-30 | typos
+796fa09636195d8751a7bbc1e1bc88bf8c3ac95a # 2022-08-30 | README/README.md
+6e687c30110a52f267c1779c4eeab82bded9cb77 # 2022-08-29 | tracelog disabled by default in /etc/firejail/firejail.config file
+836ffe37ff891886f15243eacc70963368d57a3f # 2022-08-29 | compile fix
+c6d7474c138f92b3cb3992b5c57750af89eb3b77 # 2022-08-16 | tinyLL has been removed as it's no longer needed
+460fa7a6f98cc1e7aec2953e6523f32677d546c7 # 2022-08-16 | Proposed fixes.
+877fc99d541af83a9486dfff43580e33dedd8b4c # 2022-08-15 | Update quotation marks in src/zsh_completion/_firejail.in
+ba828befe06b99b7dc2d504085cb40aa2d710998 # 2022-08-15 | Landlock functions are added to the code of Firejail, removing the dependency on tinyLL
+61b15442898eeb1db2d23b6b2eb72a705ceb368a # 2022-08-15 | Landlock support has been added.
+# "move whitelist/blacklist to allow/deny"
+f43382f1e9707b4fd5e63c7bfe881912aa4ee994 # 2021-07-18 | Revert "move whitelist/blacklist to allow/deny"
+fe0f975f447d59977d90c3226cc8c623b31b20b3 # 2021-07-05 | move whitelist/blacklist to allow/deny
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 66ca0d321..1417bbb34 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -53,7 +53,7 @@ jobs:
    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@c7f292ea4f542c473194b33813ccd4c207a6c725
+      uses: github/codeql-action/init@86f3159a697a097a813ad9bfa0002412d97690a4
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
    # If this step fails, then you should remove it and run the build manually (see below)
    - name: Autobuild
-      uses: github/codeql-action/autobuild@c7f292ea4f542c473194b33813ccd4c207a6c725
+      uses: github/codeql-action/autobuild@86f3159a697a097a813ad9bfa0002412d97690a4
    # ℹ️ Command-line programs to run using the OS shell.
    # 📚 https://git.io/JvXDl
@@ -78,4 +78,4 @@ jobs:
    #   make release
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@c7f292ea4f542c473194b33813ccd4c207a6c725
+      uses: github/codeql-action/analyze@86f3159a697a097a813ad9bfa0002412d97690a4
diff --git a/README b/README
index 39087d987..054d88cce 100644
--- a/README
+++ b/README
@@ -253,8 +253,6 @@ cayday (https://github.com/caydey)
 Christian Pinedo (https://github.com/chrpinedo)
        - added nicotine profile
        - allow python3 in totem profile
-ChrysoliteAzalea (https://github.com/ChrysoliteAzalea)
-        - Landlock support
 creideiki (https://github.com/creideiki)
        - make the sandbox process reap all children
        - tor browser profile fix
diff --git a/README.md b/README.md
index 5ea2cf39f..00d5df031 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,8 @@ alt="Deep Dive" width="240" height="142" border="10" /><br/>Deep Dive</a>
 Project webpage: https://firejail.wordpress.com/
+IRC: https://web.libera.chat/#firejail
 Download and Installation: https://firejail.wordpress.com/download-2/
 Features: https://firejail.wordpress.com/features-3/
@@ -182,15 +184,6 @@ We also keep a list of profile fixes for previous released versions in [etc-fixe
 Milestone page: https://github.com/netblue30/firejail/milestone/1
-### Modified functionality
-  * modif:  removed cgroups commands (#5190)
-  * modif: changed --disable-firetunnel into --enable-firetunnel in configure.ac (#5190)
-  * modif: disabled chroot by default in /etc/firejail/firejail.config (#5190)
-  * modif: shell none set as default (#5190)
-  * modif: removed --shell= (#5190)
-  * modif: private-lib disabled by default in /etc/firejail/firejail.config (#5190)
 ### Restrict namespaces
 `````
@@ -228,90 +221,6 @@ Milestone page: https://github.com/netblue30/firejail/milestone/1
              kernel.  For more information, please see APPARMOR  section  be‐
 `````
-### Landlock support - EXPERIMENTAL
-For the next release (0.9.72), landlock support is experimental. It is disabled in the normal build
-or in the executable archives we provide. It will be "officially" released
-in 0.9.74, sometime early next year. For now, use --enable-landlock during software compile:
-`````
-$ ./configure --enable-landlock
-`````
-The functionality is segragated with ifdefs in the code, at times it might not even compile!
-Work in progress, the interface described in the man page below could change.
-`````
-       --landlock
-              Create a Landlock ruleset (if it doesn't already exist) and  add
-              basic access rules to it. See LANDLOCK section for more informa‐
-              tion.
-       --landlock.proc=no|ro|rw
-              Add an access rule for /proc directory (read-only if set  to  ro
-              and read-write if set to rw). The access rule for /proc is added
-              after this directory is set up in the sandbox. Access rules  for
-              /proc  set  up  with other Landlock-related command-line options
-              have no effect.
-       --landlock.read=path
-              Create a Landlock ruleset (if it doesn't already exist) and  add
-              a read access rule for path.
-       --landlock.write=path
-              Create  a Landlock ruleset (if it doesn't already exist) and add
-              a write access rule for path.
-       --landlock.special=path
-              Create a Landlock ruleset (if it doesn't already exist) and  add
-              a  permission rule to create FIFO pipes, Unix domain sockets and
-              block devices beneath given path.
-       --landlock.execute=path
-              Create a Landlock ruleset (if it doesn't already exist) and  add
-              an execution permission rule for path.
-              Example:
-              $   firejail  --landlock.read=/  --landlock.write=/home  --land‐
-              lock.execute=/usr
-LANDLOCK
-       Landlock is a Linux security module first introduced in the  5.13  ver‐
-       sion  of  Linux  kernel.  It  allows unprivileged processes to restrict
-       their access to the filesystem. Once imposed,  these  restrictions  can
-       never  be  removed,  and  all child processes created by a Landlock-re‐
-       stricted processes inherit these restrictions. Firejail supports  Land‐
-       lock as an additional sandboxing feature. It can be used to ensure that
-       a sandboxed application can only access files and directories  that  it
-       was  explicitly  allowed  to  access.  Firejail supports populating the
-       ruleset with both basic set of rules and with custom set of rules.  Ba‐
-       sic  set  of  rules  allows read-only access to /bin, /dev, /etc, /lib,
-       /opt, /proc, /usr and /var, read-write access to  the  home  directory,
-       and allows execution of binaries located in /bin, /opt and /usr.
-       Important notes:
-              - A process can install a Landlock ruleset only if it has either
-              CAP_SYS_ADMIN in its effective capability set, or  the  "No  New
-              Privileges"  restriction  enabled. Because of this, enabling the
-              Landlock feature will also cause Firejail to enable the "No  New
-              Privileges"  restriction,  regardless  of  the  profile  or  the
-              --no-new-privs command line option.
-              - Access to the /proc directory is managed through  the  --land‐
-              lock.proc command line option.
-              -  Access  to  the  /etc  directory is automatically allowed. To
-              override this, use the --writable-etc command line  option.  You
-              can  also use the --private-etc option to restrict access to the
-              /etc directory.
-       To enable Landlock self-restriction on top of your current Firejail se‐
-       curity features, pass --landlock flag to Firejail command line. You can
-       also  use  --landlock.read,  --landlock.write,  --landlock.special  and
-       --landlock.execute  options  together with --landlock or instead of it.
-       Example:
-              $ firejail --landlock --landlock.read=/media  --landlock.proc=ro
-              mc
-`````
 ### Profile Statistics
 A small tool to print profile statistics. Compile and install as usual. The tool is installed in /usr/lib/firejail directory.
diff --git a/RELNOTES b/RELNOTES
index 757ebd94f..a17cc7040 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,22 +1,20 @@
 firejail (0.9.71) baseline; urgency=low
  * work in progress
-  * modif:  removed cgroups commands (#5190)
-  * modif: changed --disable-firetunnel into --enable-firetunnel in
-    configure.ac (#5190)
-  * modif: disabled chroot by default in /etc/firejail/firejail.config (#5190)
-  * modif: shell none set as default (#5190)
-  * modif: removed --shell= (#5190)
-  * modif: private-lib disabled by default in /etc/firejail/firejail.config
-    (#5190)
-  * modif: tracelog disabled by default in /etc/firejail/firejail.config
-    (#5190)
  * feature: On failing to remount a fuse filesystem, give warning instead of
    erroring out (#5240 #5242)
  * feature: restrict namespaces (--restrict-namespaces) implemented as
    a seccomp filter for both 64 and 32 bit architectures (#4939 #5259)
  * feature: support for custom AppArmor profiles (--apparmor=) (#5274 #5316
    #5317)
-  * feature: Landlock support (#5269)
+  * modif: removed --cgroup= command (#5190 #5200)
+  * modif: set --shell=none as the default (#5190)
+  * modif: removed --shell= command (#5190 #5196 #5209)
+  * modif: disabled firetunnel by default in configure.ac (#5190)
+  * modif: disabled chroot by default in /etc/firejail/firejail.config (#5190)
+  * modif: disabled private-lib by default in /etc/firejail/firejail.config
+    (#5190 #5216)
+  * modif: disabled tracelog by default in /etc/firejail/firejail.config
+    (#5190)
  * bugfix: Flood of seccomp audit log entries (#5207)
  * build: deduplicate configure-time vars into new config files (#5140 #5284)
  * build: fix file mode of shell scripts (644 -> 755) (#5206)
@@ -29,6 +27,10 @@ firejail (0.9.71) baseline; urgency=low
  * docs: mention risk of SUID binaries and also firejail-users(5) (#5288
    #5290)
  * docs: set vim filetype on man pages for syntax highlighting (#5296)
+  * docs: note that blacklist/whitelist follow symlinks (#5344)
+  * docs: Add IRC channel info to README.md (#5361)
+  * docs: man: Note that some commands can be disabled in firejail.config
+    (#5366)
 -- netblue30 <netblue30@yahoo.com>  Sat, 11 Jun 2022 09:00:00 -0500
 firejail (0.9.70) baseline; urgency=low
diff --git a/config.mk.in b/config.mk.in
index 150ac8e15..9973b7eaa 100644
--- a/config.mk.in
+++ b/config.mk.in
@@ -41,7 +41,6 @@ HAVE_PRIVATE_HOME=@HAVE_PRIVATE_HOME@
 HAVE_IDS=@HAVE_IDS@
 HAVE_GCOV=@HAVE_GCOV@
 HAVE_SELINUX=@HAVE_SELINUX@
-HAVE_LANDLOCK=@HAVE_LANDLOCK@
 HAVE_SUID=@HAVE_SUID@
 HAVE_DBUSPROXY=@HAVE_DBUSPROXY@
 HAVE_USERTMPFS=@HAVE_USERTMPFS@
@@ -50,7 +49,7 @@ HAVE_LTS=@HAVE_LTS@
 HAVE_FORCE_NONEWPRIVS=@HAVE_FORCE_NONEWPRIVS@
 HAVE_ONLY_SYSCFG_PROFILES=@HAVE_ONLY_SYSCFG_PROFILES@
-MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_LANDLOCK) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES)
+MANFLAGS = $(HAVE_LTS) $(HAVE_OUTPUT) $(HAVE_X11) $(HAVE_PRIVATE_HOME) $(HAVE_APPARMOR) $(HAVE_IDS) $(HAVE_OVERLAYFS) $(HAVE_USERTMPFS) $(HAVE_DBUSPROXY) $(HAVE_FIRETUNNEL) $(HAVE_GLOBALCFG) $(HAVE_CHROOT) $(HAVE_NETWORK) $(HAVE_USERNS) $(HAVE_FILE_TRANSFER) $(HAVE_SELINUX) $(HAVE_SUID) $(HAVE_FORCE_NONEWPRIVS) $(HAVE_ONLY_SYSCFG_PROFILES)
 CC=@CC@
 CFLAGS=@CFLAGS@
diff --git a/configure b/configure
index ab000762d..f3bd77169 100755
--- a/configure
+++ b/configure
@@ -624,6 +624,9 @@ ac_includes_default="\
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+EGREP
+GREP
+CPP
 HAVE_LTS
 HAVE_ONLY_SYSCFG_PROFILES
 HAVE_FORCE_NONEWPRIVS
@@ -648,10 +651,6 @@ HAVE_OVERLAYFS
 HAVE_DBUSPROXY
 EXTRA_LDFLAGS
 EXTRA_CFLAGS
-EGREP
-GREP
-CPP
-HAVE_LANDLOCK
 HAVE_SELINUX
 AA_LIBS
 AA_CFLAGS
@@ -714,7 +713,6 @@ enable_sanitizer
 enable_ids
 enable_apparmor
 enable_selinux
-enable_landlock
 enable_dbusproxy
 enable_output
 enable_usertmpfs
@@ -1376,7 +1374,6 @@ Optional Features:
  --enable-ids            enable ids
  --enable-apparmor       enable apparmor
  --enable-selinux        SELinux labeling support
-  --enable-landlock       Landlock self-restriction support
  --disable-dbusproxy     disable dbus proxy
  --disable-output        disable --output logging
  --disable-usertmpfs     disable tmpfs as regular user
@@ -3345,11 +3342,336 @@ if test "x$enable_selinux" = "xyes"; then :
 fi
-HAVE_LANDLOCK=""
-# Check whether --enable-landlock was given.
-if test "${enable_landlock+set}" = set; then :
-  enableval=$enable_landlock;
+HAVE_DBUSPROXY=""
+# Check whether --enable-dbusproxy was given.
+if test "${enable_dbusproxy+set}" = set; then :
+  enableval=$enable_dbusproxy;
+fi
+if test "x$enable_dbusproxy" != "xno"; then :
+        HAVE_DBUSPROXY="-DHAVE_DBUSPROXY"
+fi
+# overlayfs features temporarily disabled pending fixes
+HAVE_OVERLAYFS=""
+#AC_ARG_ENABLE([overlayfs],
+#    [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])])
+#AS_IF([test "x$enable_overlayfs" != "xno"], [
+#       HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
+#])
+HAVE_OUTPUT=""
+# Check whether --enable-output was given.
+if test "${enable_output+set}" = set; then :
+  enableval=$enable_output;
+fi
+if test "x$enable_output" != "xno"; then :
+        HAVE_OUTPUT="-DHAVE_OUTPUT"
+fi
+HAVE_USERTMPFS=""
+# Check whether --enable-usertmpfs was given.
+if test "${enable_usertmpfs+set}" = set; then :
+  enableval=$enable_usertmpfs;
+fi
+if test "x$enable_usertmpfs" != "xno"; then :
+        HAVE_USERTMPFS="-DHAVE_USERTMPFS"
+fi
+HAVE_MAN="no"
+# Check whether --enable-man was given.
+if test "${enable_man+set}" = set; then :
+  enableval=$enable_man;
+fi
+if test "x$enable_man" != "xno"; then :
+        HAVE_MAN="-DHAVE_MAN"
+        # Extract the first word of "gawk", so it can be a program name with args.
+set dummy gawk; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_GAWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_GAWK"; then
+  ac_cv_prog_HAVE_GAWK="$HAVE_GAWK" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_HAVE_GAWK="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  test -z "$ac_cv_prog_HAVE_GAWK" && ac_cv_prog_HAVE_GAWK="no"
+fi
+fi
+HAVE_GAWK=$ac_cv_prog_HAVE_GAWK
+if test -n "$HAVE_GAWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GAWK" >&5
+$as_echo "$HAVE_GAWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+        if test "x$HAVE_GAWK" != "xyes"; then :
+  as_fn_error $? "*** gawk not found ***" "$LINENO" 5
+fi
+fi
+HAVE_FIRETUNNEL=""
+# Check whether --enable-firetunnel was given.
+if test "${enable_firetunnel+set}" = set; then :
+  enableval=$enable_firetunnel;
+fi
+if test "x$enable_firetunnel" = "xyes"; then :
+        HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL"
+fi
+HAVE_PRIVATE_HOME=""
+# Check whether --enable-private-home was given.
+if test "${enable_private_home+set}" = set; then :
+  enableval=$enable_private_home;
+fi
+if test "x$enable_private_home" != "xno"; then :
+        HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME"
+fi
+HAVE_CHROOT=""
+# Check whether --enable-chroot was given.
+if test "${enable_chroot+set}" = set; then :
+  enableval=$enable_chroot;
+fi
+if test "x$enable_chroot" != "xno"; then :
+        HAVE_CHROOT="-DHAVE_CHROOT"
+fi
+HAVE_GLOBALCFG=""
+# Check whether --enable-globalcfg was given.
+if test "${enable_globalcfg+set}" = set; then :
+  enableval=$enable_globalcfg;
+fi
+if test "x$enable_globalcfg" != "xno"; then :
+        HAVE_GLOBALCFG="-DHAVE_GLOBALCFG"
+fi
+HAVE_NETWORK=""
+# Check whether --enable-network was given.
+if test "${enable_network+set}" = set; then :
+  enableval=$enable_network;
+fi
+if test "x$enable_network" != "xno"; then :
+        HAVE_NETWORK="-DHAVE_NETWORK"
+fi
+HAVE_USERNS=""
+# Check whether --enable-userns was given.
+if test "${enable_userns+set}" = set; then :
+  enableval=$enable_userns;
+fi
+if test "x$enable_userns" != "xno"; then :
+        HAVE_USERNS="-DHAVE_USERNS"
+fi
+HAVE_X11=""
+# Check whether --enable-x11 was given.
+if test "${enable_x11+set}" = set; then :
+  enableval=$enable_x11;
+fi
+if test "x$enable_x11" != "xno"; then :
+        HAVE_X11="-DHAVE_X11"
+fi
+HAVE_FILE_TRANSFER=""
+# Check whether --enable-file-transfer was given.
+if test "${enable_file_transfer+set}" = set; then :
+  enableval=$enable_file_transfer;
+fi
+if test "x$enable_file_transfer" != "xno"; then :
+        HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER"
+fi
+HAVE_SUID=""
+# Check whether --enable-suid was given.
+if test "${enable_suid+set}" = set; then :
+  enableval=$enable_suid;
+fi
+if test "x$enable_suid" != "xno"; then :
+        HAVE_SUID="-DHAVE_SUID"
+fi
+HAVE_FATAL_WARNINGS=""
+# Check whether --enable-fatal_warnings was given.
+if test "${enable_fatal_warnings+set}" = set; then :
+  enableval=$enable_fatal_warnings;
+fi
+if test "x$enable_fatal_warnings" = "xyes"; then :
+        HAVE_FATAL_WARNINGS="-W -Wall -Werror"
+fi
+BUSYBOX_WORKAROUND="no"
+# Check whether --enable-busybox-workaround was given.
+if test "${enable_busybox_workaround+set}" = set; then :
+  enableval=$enable_busybox_workaround;
+fi
+if test "x$enable_busybox_workaround" = "xyes"; then :
+        BUSYBOX_WORKAROUND="yes"
+fi
+HAVE_GCOV=""
+# Check whether --enable-gcov was given.
+if test "${enable_gcov+set}" = set; then :
+  enableval=$enable_gcov;
+fi
+if test "x$enable_gcov" = "xyes"; then :
+        HAVE_GCOV="--coverage -DHAVE_GCOV"
+        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage"
+fi
+HAVE_CONTRIB_INSTALL="yes"
+# Check whether --enable-contrib-install was given.
+if test "${enable_contrib_install+set}" = set; then :
+  enableval=$enable_contrib_install;
+fi
+if test "x$enable_contrib_install" = "xno"; then :
+       HAVE_CONTRIB_INSTALL="no"
+fi
+HAVE_FORCE_NONEWPRIVS=""
+# Check whether --enable-force-nonewprivs was given.
+if test "${enable_force_nonewprivs+set}" = set; then :
+  enableval=$enable_force_nonewprivs;
+fi
+if test "x$enable_force_nonewprivs" = "xyes"; then :
+        HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS"
+fi
+HAVE_ONLY_SYSCFG_PROFILES=""
+# Check whether --enable-only-syscfg-profiles was given.
+if test "${enable_only_syscfg_profiles+set}" = set; then :
+  enableval=$enable_only_syscfg_profiles;
+fi
+if test "x$enable_only_syscfg_profiles" = "xyes"; then :
+    HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES"
+fi
+HAVE_LTS=""
+# Check whether --enable-lts was given.
+if test "${enable_lts+set}" = set; then :
+  enableval=$enable_lts;
+fi
+if test "x$enable_lts" = "xyes"; then :
+        HAVE_LTS="-DHAVE_LTS"
+        HAVE_IDS=""
+        HAVE_DBUSPROXY=""
+        HAVE_OVERLAYFS=""
+        HAVE_OUTPUT=""
+        HAVE_USERTMPFS=""
+        HAVE_MAN="-DHAVE_MAN"
+        HAVE_FIRETUNNEL=""
+        HAVE_PRIVATE_HOME=""
+        HAVE_CHROOT=""
+        HAVE_GLOBALCFG=""
+        HAVE_USERNS=""
+        HAVE_X11=""
+        HAVE_FILE_TRANSFER=""
+        HAVE_SUID="-DHAVE_SUID"
+        BUSYBOX_WORKAROUND="no"
+        HAVE_CONTRIB_INSTALL="no",
 fi
 ac_ext=c
@@ -3749,352 +4071,6 @@ fi
 done
-if test "x$enable_landlock" = "xyes"; then :
-        ac_fn_c_check_header_mongrel "$LINENO" "linux/landlock.h" "ac_cv_header_linux_landlock_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_landlock_h" = xyes; then :
-else
-  as_fn_error $? "*** LANDLOCK support is not installed (/usr/include/linux/landlock.h missing) ***" "$LINENO" 5
-fi
-        HAVE_LANDLOCK="-DHAVE_LANDLOCK"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS"
-fi
-HAVE_DBUSPROXY=""
-# Check whether --enable-dbusproxy was given.
-if test "${enable_dbusproxy+set}" = set; then :
-  enableval=$enable_dbusproxy;
-fi
-if test "x$enable_dbusproxy" != "xno"; then :
-        HAVE_DBUSPROXY="-DHAVE_DBUSPROXY"
-fi
-# overlayfs features temporarily disabled pending fixes
-HAVE_OVERLAYFS=""
-#AC_ARG_ENABLE([overlayfs],
-#    [AS_HELP_STRING([--disable-overlayfs], [disable overlayfs])])
-#AS_IF([test "x$enable_overlayfs" != "xno"], [
-#       HAVE_OVERLAYFS="-DHAVE_OVERLAYFS"
-#])
-HAVE_OUTPUT=""
-# Check whether --enable-output was given.
-if test "${enable_output+set}" = set; then :
-  enableval=$enable_output;
-fi
-if test "x$enable_output" != "xno"; then :
-        HAVE_OUTPUT="-DHAVE_OUTPUT"
-fi
-HAVE_USERTMPFS=""
-# Check whether --enable-usertmpfs was given.
-if test "${enable_usertmpfs+set}" = set; then :
-  enableval=$enable_usertmpfs;
-fi
-if test "x$enable_usertmpfs" != "xno"; then :
-        HAVE_USERTMPFS="-DHAVE_USERTMPFS"
-fi
-HAVE_MAN="no"
-# Check whether --enable-man was given.
-if test "${enable_man+set}" = set; then :
-  enableval=$enable_man;
-fi
-if test "x$enable_man" != "xno"; then :
-        HAVE_MAN="-DHAVE_MAN"
-        # Extract the first word of "gawk", so it can be a program name with args.
-set dummy gawk; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_GAWK+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$HAVE_GAWK"; then
-  ac_cv_prog_HAVE_GAWK="$HAVE_GAWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_HAVE_GAWK="yes"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-  test -z "$ac_cv_prog_HAVE_GAWK" && ac_cv_prog_HAVE_GAWK="no"
-fi
-fi
-HAVE_GAWK=$ac_cv_prog_HAVE_GAWK
-if test -n "$HAVE_GAWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_GAWK" >&5
-$as_echo "$HAVE_GAWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-        if test "x$HAVE_GAWK" != "xyes"; then :
-  as_fn_error $? "*** gawk not found ***" "$LINENO" 5
-fi
-fi
-HAVE_FIRETUNNEL=""
-# Check whether --enable-firetunnel was given.
-if test "${enable_firetunnel+set}" = set; then :
-  enableval=$enable_firetunnel;
-fi
-if test "x$enable_firetunnel" = "xyes"; then :
-        HAVE_FIRETUNNEL="-DHAVE_FIRETUNNEL"
-fi
-HAVE_PRIVATE_HOME=""
-# Check whether --enable-private-home was given.
-if test "${enable_private_home+set}" = set; then :
-  enableval=$enable_private_home;
-fi
-if test "x$enable_private_home" != "xno"; then :
-        HAVE_PRIVATE_HOME="-DHAVE_PRIVATE_HOME"
-fi
-HAVE_CHROOT=""
-# Check whether --enable-chroot was given.
-if test "${enable_chroot+set}" = set; then :
-  enableval=$enable_chroot;
-fi
-if test "x$enable_chroot" != "xno"; then :
-        HAVE_CHROOT="-DHAVE_CHROOT"
-fi
-HAVE_GLOBALCFG=""
-# Check whether --enable-globalcfg was given.
-if test "${enable_globalcfg+set}" = set; then :
-  enableval=$enable_globalcfg;
-fi
-if test "x$enable_globalcfg" != "xno"; then :
-        HAVE_GLOBALCFG="-DHAVE_GLOBALCFG"
-fi
-HAVE_NETWORK=""
-# Check whether --enable-network was given.
-if test "${enable_network+set}" = set; then :
-  enableval=$enable_network;
-fi
-if test "x$enable_network" != "xno"; then :
-        HAVE_NETWORK="-DHAVE_NETWORK"
-fi
-HAVE_USERNS=""
-# Check whether --enable-userns was given.
-if test "${enable_userns+set}" = set; then :
-  enableval=$enable_userns;
-fi
-if test "x$enable_userns" != "xno"; then :
-        HAVE_USERNS="-DHAVE_USERNS"
-fi
-HAVE_X11=""
-# Check whether --enable-x11 was given.
-if test "${enable_x11+set}" = set; then :
-  enableval=$enable_x11;
-fi
-if test "x$enable_x11" != "xno"; then :
-        HAVE_X11="-DHAVE_X11"
-fi
-HAVE_FILE_TRANSFER=""
-# Check whether --enable-file-transfer was given.
-if test "${enable_file_transfer+set}" = set; then :
-  enableval=$enable_file_transfer;
-fi
-if test "x$enable_file_transfer" != "xno"; then :
-        HAVE_FILE_TRANSFER="-DHAVE_FILE_TRANSFER"
-fi
-HAVE_SUID=""
-# Check whether --enable-suid was given.
-if test "${enable_suid+set}" = set; then :
-  enableval=$enable_suid;
-fi
-if test "x$enable_suid" != "xno"; then :
-        HAVE_SUID="-DHAVE_SUID"
-fi
-HAVE_FATAL_WARNINGS=""
-# Check whether --enable-fatal_warnings was given.
-if test "${enable_fatal_warnings+set}" = set; then :
-  enableval=$enable_fatal_warnings;
-fi
-if test "x$enable_fatal_warnings" = "xyes"; then :
-        HAVE_FATAL_WARNINGS="-W -Wall -Werror"
-fi
-BUSYBOX_WORKAROUND="no"
-# Check whether --enable-busybox-workaround was given.
-if test "${enable_busybox_workaround+set}" = set; then :
-  enableval=$enable_busybox_workaround;
-fi
-if test "x$enable_busybox_workaround" = "xyes"; then :
-        BUSYBOX_WORKAROUND="yes"
-fi
-HAVE_GCOV=""
-# Check whether --enable-gcov was given.
-if test "${enable_gcov+set}" = set; then :
-  enableval=$enable_gcov;
-fi
-if test "x$enable_gcov" = "xyes"; then :
-        HAVE_GCOV="--coverage -DHAVE_GCOV"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lgcov --coverage"
-fi
-HAVE_CONTRIB_INSTALL="yes"
-# Check whether --enable-contrib-install was given.
-if test "${enable_contrib_install+set}" = set; then :
-  enableval=$enable_contrib_install;
-fi
-if test "x$enable_contrib_install" = "xno"; then :
-       HAVE_CONTRIB_INSTALL="no"
-fi
-HAVE_FORCE_NONEWPRIVS=""
-# Check whether --enable-force-nonewprivs was given.
-if test "${enable_force_nonewprivs+set}" = set; then :
-  enableval=$enable_force_nonewprivs;
-fi
-if test "x$enable_force_nonewprivs" = "xyes"; then :
-        HAVE_FORCE_NONEWPRIVS="-DHAVE_FORCE_NONEWPRIVS"
-fi
-HAVE_ONLY_SYSCFG_PROFILES=""
-# Check whether --enable-only-syscfg-profiles was given.
-if test "${enable_only_syscfg_profiles+set}" = set; then :
-  enableval=$enable_only_syscfg_profiles;
-fi
-if test "x$enable_only_syscfg_profiles" = "xyes"; then :
-    HAVE_ONLY_SYSCFG_PROFILES="-DHAVE_ONLY_SYSCFG_PROFILES"
-fi
-HAVE_LTS=""
-# Check whether --enable-lts was given.
-if test "${enable_lts+set}" = set; then :
-  enableval=$enable_lts;
-fi
-if test "x$enable_lts" = "xyes"; then :
-        HAVE_LTS="-DHAVE_LTS"
-        HAVE_IDS=""
-        HAVE_DBUSPROXY=""
-        HAVE_OVERLAYFS=""
-        HAVE_OUTPUT=""
-        HAVE_USERTMPFS=""
-        HAVE_MAN="-DHAVE_MAN"
-        HAVE_FIRETUNNEL=""
-        HAVE_PRIVATE_HOME=""
-        HAVE_CHROOT=""
-        HAVE_GLOBALCFG=""
-        HAVE_USERNS=""
-        HAVE_X11=""
-        HAVE_FILE_TRANSFER=""
-        HAVE_SUID="-DHAVE_SUID"
-        BUSYBOX_WORKAROUND="no"
-        HAVE_CONTRIB_INSTALL="no",
-fi
 ac_fn_c_check_header_mongrel "$LINENO" "linux/seccomp.h" "ac_cv_header_linux_seccomp_h" "$ac_includes_default"
 if test "x$ac_cv_header_linux_seccomp_h" = xyes; then :
diff --git a/configure.ac b/configure.ac
index 58a399597..8a488ff43 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,19 +81,10 @@ AS_IF([test "x$enable_selinux" = "xyes"], [
        EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lselinux"
 ])
-HAVE_LANDLOCK=""
-AC_SUBST([HAVE_LANDLOCK])
-AC_ARG_ENABLE([landlock],
-    [AS_HELP_STRING([--enable-landlock], [Landlock self-restriction support])])
-AS_IF([test "x$enable_landlock" = "xyes"], [
-        AC_CHECK_HEADER([linux/landlock.h], [], AC_MSG_ERROR([*** LANDLOCK support is not installed (/usr/include/linux/landlock.h missing) ***]))
-        HAVE_LANDLOCK="-DHAVE_LANDLOCK"
-        EXTRA_LDFLAGS="$EXTRA_LDFLAGS"
-])
 AC_SUBST([EXTRA_CFLAGS])
 AC_SUBST([EXTRA_LDFLAGS])
 HAVE_DBUSPROXY=""
 AC_SUBST([HAVE_DBUSPROXY])
 AC_ARG_ENABLE([dbusproxy],
diff --git a/contrib/gdb-firejail.sh b/contrib/gdb-firejail.sh
index 397438e1e..35348088e 100755
--- a/contrib/gdb-firejail.sh
+++ b/contrib/gdb-firejail.sh
@@ -17,7 +17,7 @@ if [ -z "${1##*/firejail}" ]; then
 else
    # First argument is not named firejail, then add default unless environment
    # variable already set.
-    set -- ${FIREJAIL:=$(which firejail)} "$@"
+    set -- ${FIREJAIL:=$(command -v firejail)} "$@"
 fi
 bash -c "kill -STOP \$\$; exec \"\$0\" \"\$@\"" "$@" &
diff --git a/contrib/vim/syntax/firejail.vim b/contrib/vim/syntax/firejail.vim
index 7c1c33421..0c8ebdbd8 100644
--- a/contrib/vim/syntax/firejail.vim
+++ b/contrib/vim/syntax/firejail.vim
@@ -52,7 +52,7 @@ syn match fjVar /\v\$\{(CFG|DESKTOP|DOCUMENTS|DOWNLOADS|HOME|MUSIC|PATH|PICTURES
 " Commands grabbed from: src/firejail/profile.c
 " Generate list with: { rg -o 'strn?cmp\(ptr, "([^"]+) "' -r '$1' src/firejail/profile.c; echo private-lib; } | grep -vEx '(include|ignore|caps\.drop|caps\.keep|protocol|restrict-namespaces|seccomp|seccomp\.drop|seccomp\.keep|env|rmenv|net|ip)' | sort -u | tr $'\n' '|' # private-lib is special-cased in the code and doesn't match the regex; grep-ed patterns are handled later with 'syn match nextgroup=' directives (except for include which is special-cased as a fjCommandNoCond keyword)
-syn match fjCommand /\v(apparmor|bind|blacklist|blacklist-nolog|cpu|defaultgw|dns|hostname|hosts-file|ip6|iprange|join-or-start|landlock|landlock.proc|landlock.read|landlock.write|landlock.special|landlock.execute|mac|mkdir|mkfile|mtu|name|netfilter|netfilter6|netmask|nice|noblacklist|noexec|nowhitelist|overlay-named|private|private-bin|private-cwd|private-etc|private-home|private-lib|private-opt|private-srv|read-only|read-write|rlimit-as|rlimit-cpu|rlimit-fsize|rlimit-nofile|rlimit-nproc|rlimit-sigpending|timeout|tmpfs|veth-name|whitelist|xephyr-screen) / skipwhite contained
+syn match fjCommand /\v(apparmor|bind|blacklist|blacklist-nolog|cpu|defaultgw|dns|hostname|hosts-file|ip6|iprange|join-or-start|mac|mkdir|mkfile|mtu|name|netfilter|netfilter6|netmask|nice|noblacklist|noexec|nowhitelist|overlay-named|private|private-bin|private-cwd|private-etc|private-home|private-lib|private-opt|private-srv|read-only|read-write|rlimit-as|rlimit-cpu|rlimit-fsize|rlimit-nofile|rlimit-nproc|rlimit-sigpending|timeout|tmpfs|veth-name|whitelist|xephyr-screen) / skipwhite contained
 " Generate list with: rg -o 'strn?cmp\(ptr, "([^ "]*[^ ])"' -r '$1' src/firejail/profile.c | grep -vEx '(include|rlimit|quiet)' | sed -e 's/\./\\./' | sort -u | tr $'\n' '|' # include/rlimit are false positives, quiet is special-cased below
 syn match fjCommand /\v(allow-debuggers|allusers|apparmor|caps|deterministic-exit-code|deterministic-shutdown|disable-mnt|ipc-namespace|keep-config-pulse|keep-dev-shm|keep-fd|keep-var-tmp|machine-id|memory-deny-write-execute|netfilter|no3d|noautopulse|nodbus|nodvd|nogroups|noinput|nonewprivs|noprinters|noroot|nosound|notv|nou2f|novideo|overlay|overlay-tmpfs|private|private-cache|private-cwd|private-dev|private-lib|private-tmp|seccomp|seccomp\.32|seccomp\.block-secondary|tracelog|writable-etc|writable-run-user|writable-var|writable-var-log|x11)$/ contained
 syn match fjCommand /ignore / nextgroup=fjCommand,fjCommandNoCond skipwhite contained
diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc
index 7ad491460..b86e0bbe4 100644
--- a/etc/inc/disable-programs.inc
+++ b/etc/inc/disable-programs.inc
@@ -1172,6 +1172,7 @@ blacklist ${HOME}/yt-dlp.conf
 blacklist ${HOME}/yt-dlp.conf.txt
 blacklist ${RUNUSER}/*firefox*
 blacklist ${RUNUSER}/akonadi
+blacklist ${RUNUSER}/psd/*firefox*
 blacklist /tmp/.wine-*
 blacklist /tmp/akonadi-*
 blacklist /var/games/nethack
diff --git a/etc/profile-a-l/Discord.profile b/etc/profile-a-l/Discord.profile
index 3f274b21c..68fcf157f 100644
--- a/etc/profile-a-l/Discord.profile
+++ b/etc/profile-a-l/Discord.profile
@@ -3,15 +3,8 @@
 # Persistent local customizations
 include Discord.local
 # Persistent global definitions
-include globals.local
+# added by included profile
+#include globals.local
-noblacklist ${HOME}/.config/discord
-mkdir ${HOME}/.config/discord
-whitelist ${HOME}/.config/discord
-private-bin Discord
-private-opt Discord
 # Redirect
-include discord-common.profile
+include discord.profile
diff --git a/etc/profile-a-l/DiscordCanary.profile b/etc/profile-a-l/DiscordCanary.profile
index d24e73ed8..ee6576955 100644
--- a/etc/profile-a-l/DiscordCanary.profile
+++ b/etc/profile-a-l/DiscordCanary.profile
@@ -3,15 +3,8 @@
 # Persistent local customizations
 include DiscordCanary.local
 # Persistent global definitions
-include globals.local
+# added by included profile
+#include globals.local
-noblacklist ${HOME}/.config/discordcanary
-mkdir ${HOME}/.config/discordcanary
-whitelist ${HOME}/.config/discordcanary
-private-bin DiscordCanary
-private-opt DiscordCanary
 # Redirect
-include discord-common.profile
+include discord-canary.profile
diff --git a/etc/profile-a-l/arduino.profile b/etc/profile-a-l/arduino.profile
index 0daab7dcd..bb0bc3513 100644
--- a/etc/profile-a-l/arduino.profile
+++ b/etc/profile-a-l/arduino.profile
@@ -10,13 +10,10 @@ noblacklist ${HOME}/.arduino15
 noblacklist ${HOME}/Arduino
 noblacklist ${DOCUMENTS}
-# Allow java (blacklisted by disable-devel.inc)
+# Allows files commonly used by IDEs
-include allow-java.inc
+include allow-common-devel.inc
 include disable-common.inc
-include disable-devel.inc
-include disable-exec.inc
-include disable-interpreters.inc
 include disable-programs.inc
 include disable-xdg.inc
diff --git a/etc/profile-a-l/darktable.profile b/etc/profile-a-l/darktable.profile
index 4ee61b66d..20d5657eb 100644
--- a/etc/profile-a-l/darktable.profile
+++ b/etc/profile-a-l/darktable.profile
@@ -10,8 +10,12 @@ noblacklist ${HOME}/.cache/darktable
 noblacklist ${HOME}/.config/darktable
 noblacklist ${PICTURES}
+# Allow lua (blacklisted by disable-interpreters.inc)
 include allow-lua.inc
+# Allow perl (blacklisted by disable-interpreters.inc)
+include allow-perl.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
@@ -33,7 +37,7 @@ novideo
 protocol unix,inet,inet6
 seccomp
-#private-bin darktable
+#private-bin darktable,exiftool,perl
 private-dev
 private-tmp
diff --git a/etc/profile-a-l/digikam.profile b/etc/profile-a-l/digikam.profile
index f1056482c..c1f0e3a14 100644
--- a/etc/profile-a-l/digikam.profile
+++ b/etc/profile-a-l/digikam.profile
@@ -13,6 +13,9 @@ noblacklist ${HOME}/.kde4/share/apps/digikam
 noblacklist ${HOME}/.local/share/kxmlgui5/digikam
 noblacklist ${PICTURES}
+# Allow perl (blacklisted by disable-interpreters.inc)
+include allow-perl.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
diff --git a/etc/profile-a-l/discord-canary.profile b/etc/profile-a-l/discord-canary.profile
index 43db95b8a..245b07b8d 100644
--- a/etc/profile-a-l/discord-canary.profile
+++ b/etc/profile-a-l/discord-canary.profile
@@ -10,8 +10,8 @@ noblacklist ${HOME}/.config/discordcanary
 mkdir ${HOME}/.config/discordcanary
 whitelist ${HOME}/.config/discordcanary
-private-bin discord-canary,electron,electron[0-9],electron[0-9][0-9]
+private-bin discord-canary,DiscordCanary
-private-opt discord-canary
+private-opt discord-canary,DiscordCanary
 # Redirect
 include discord-common.profile
diff --git a/etc/profile-a-l/discord-common.profile b/etc/profile-a-l/discord-common.profile
index c04e38899..bf49c8d48 100644
--- a/etc/profile-a-l/discord-common.profile
+++ b/etc/profile-a-l/discord-common.profile
@@ -23,7 +23,7 @@ ignore novideo
 whitelist ${HOME}/.config/BetterDiscord
 whitelist ${HOME}/.local/share/betterdiscordctl
-private-bin bash,cut,echo,egrep,electron,electron[0-9],electron[0-9][0-9],fish,grep,head,sed,sh,tclsh,tr,xdg-mime,xdg-open,zsh
+private-bin awk,bash,cut,echo,egrep,electron,electron[0-9],electron[0-9][0-9],fish,grep,head,sed,sh,tclsh,tr,which,xdg-mime,xdg-open,zsh
 private-etc alternatives,ca-certificates,crypto-policies,fonts,group,ld.so.cache,ld.so.preload,localtime,login.defs,machine-id,password,pki,pulse,resolv.conf,ssl
 join-or-start discord
diff --git a/etc/profile-a-l/discord.profile b/etc/profile-a-l/discord.profile
index 8ef02a30f..02d1c65cd 100644
--- a/etc/profile-a-l/discord.profile
+++ b/etc/profile-a-l/discord.profile
@@ -10,8 +10,8 @@ noblacklist ${HOME}/.config/discord
 mkdir ${HOME}/.config/discord
 whitelist ${HOME}/.config/discord
-private-bin discord
+private-bin discord,Discord
-private-opt discord
+private-opt discord,Discord
 # Redirect
 include discord-common.profile
diff --git a/etc/profile-a-l/firefox.profile b/etc/profile-a-l/firefox.profile
index 702e271eb..0e1d30958 100644
--- a/etc/profile-a-l/firefox.profile
+++ b/etc/profile-a-l/firefox.profile
@@ -17,6 +17,7 @@ include globals.local
 noblacklist ${HOME}/.cache/mozilla
 noblacklist ${HOME}/.mozilla
 noblacklist ${RUNUSER}/*firefox*
+noblacklist ${RUNUSER}/psd/*firefox*
 blacklist /usr/libexec
@@ -37,6 +38,7 @@ whitelist /usr/share/gtk-doc/html
 whitelist /usr/share/mozilla
 whitelist /usr/share/webext
 whitelist ${RUNUSER}/*firefox*
+whitelist ${RUNUSER}/psd/*firefox*
 include whitelist-usr-share-common.inc
 # firefox requires a shell to launch on Arch - add the next line to your firefox.local to enable private-bin.
diff --git a/etc/profile-a-l/geeqie.profile b/etc/profile-a-l/geeqie.profile
index 81574517d..268c3b334 100644
--- a/etc/profile-a-l/geeqie.profile
+++ b/etc/profile-a-l/geeqie.profile
@@ -10,6 +10,9 @@ noblacklist ${HOME}/.cache/geeqie
 noblacklist ${HOME}/.config/geeqie
 noblacklist ${HOME}/.local/share/geeqie
+# Allow perl (blacklisted by disable-interpreters.inc)
+include allow-perl.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-interpreters.inc
diff --git a/etc/profile-a-l/hugin.profile b/etc/profile-a-l/hugin.profile
index fc142e2dc..d4587a303 100644
--- a/etc/profile-a-l/hugin.profile
+++ b/etc/profile-a-l/hugin.profile
@@ -13,6 +13,9 @@ noblacklist ${PICTURES}
 # Allow /bin/sh (blacklisted by disable-shell.inc)
 include allow-bin-sh.inc
+# Allow perl (blacklisted by disable-interpreters.inc)
+include allow-perl.inc
 include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
@@ -35,7 +38,7 @@ novideo
 protocol unix
 seccomp
-private-bin align_image_stack,autooptimiser,calibrate_lens_gui,celeste_standalone,checkpto,cpclean,cpfind,deghosting_mask,enblend,fulla,geocpset,hugin,hugin_executor,hugin_hdrmerge,hugin_lensdb,hugin_stitch_project,icpfind,linefind,nona,pano_modify,pano_trafo,PTBatcherGUI,pto_gen,pto_lensstack,pto_mask,pto_merge,pto_move,pto_template,pto_var,sh,tca_correct,uname,verdandi,vig_optimize
+private-bin align_image_stack,autooptimiser,calibrate_lens_gui,celeste_standalone,checkpto,cpclean,cpfind,deghosting_mask,enblend,exiftool,fulla,geocpset,hugin,hugin_executor,hugin_hdrmerge,hugin_lensdb,hugin_stitch_project,icpfind,linefind,nona,pano_modify,pano_trafo,perl,PTBatcherGUI,pto_gen,pto_lensstack,pto_mask,pto_merge,pto_move,pto_template,pto_var,sh,tca_correct,uname,verdandi,vig_optimize
 private-cache
 private-dev
 private-tmp
diff --git a/src/bash_completion/firejail.bash_completion.in b/src/bash_completion/firejail.bash_completion.in
index 4829f1fde..8e047ce90 100644
--- a/src/bash_completion/firejail.bash_completion.in
+++ b/src/bash_completion/firejail.bash_completion.in
@@ -42,22 +42,6 @@ _firejail()
            _filedir -d
            return 0
            ;;
-        --landlock.read)
-            _filedir
-            return 0
-            ;;
-        --landlock.write)
-            _filedir
-            return 0
-            ;;
-        --landlock.special)
-            _filedir
-            return 0
-            ;;
-        --landlock.execute)
-            _filedir
-            return 0
-            ;;
        --tmpfs)
            _filedir
            return 0
diff --git a/src/firejail/checkcfg.c b/src/firejail/checkcfg.c
index fd2f3621e..62b8c4dc4 100644
--- a/src/firejail/checkcfg.c
+++ b/src/firejail/checkcfg.c
@@ -378,14 +378,6 @@ void print_compiletime_support(void) {
 #endif
                );
-        printf("\t- Landlock support is %s\n",
-#ifdef HAVE_LANDLOCK
-                "enabled"
-#else
-                "disabled"
-#endif
-                );
        printf("\t- networking support is %s\n",
 #ifdef HAVE_NETWORK
                "enabled"
diff --git a/src/firejail/firejail.h b/src/firejail/firejail.h
index a3b38b5e0..94f970eb8 100644
--- a/src/firejail/firejail.h
+++ b/src/firejail/firejail.h
@@ -22,9 +22,6 @@
 #include "../include/common.h"
 #include "../include/euid_common.h"
 #include "../include/rundefs.h"
-#ifdef HAVE_LANDLOCK
-#include <linux/landlock.h>
-#endif
 #include <linux/limits.h> // Note: Plain limits.h may break ARG_MAX (see #4583)
 #include <stdarg.h>
 #include <sys/stat.h>
@@ -33,6 +30,7 @@
 //#define DEBUG_RESTRICTED_SHELL
 // profiles
 #define DEFAULT_USER_PROFILE    "default"
 #define DEFAULT_ROOT_PROFILE    "server"
@@ -288,11 +286,6 @@ extern int arg_seccomp32;	// enable default seccomp filter for 32 bit arch
 extern int arg_seccomp_postexec;        // need postexec ld.preload library?
 extern int arg_seccomp_block_secondary; // block any secondary architectures
-#ifdef HAVE_LANDLOCK
-extern int arg_landlock; // Landlock ruleset file descriptor
-extern int arg_landlock_proc;                           // Landlock rule for accessing /proc (0 for no access, 1 for read-only and 2 for read-write)
-#endif
 extern int arg_caps_default_filter;     // enable default capabilities filter
 extern int arg_caps_drop;               // drop list
 extern int arg_caps_drop_all;           // drop all capabilities
@@ -945,16 +938,4 @@ void run_ids(int argc, char **argv);
 // oom.c
 void oom_set(const char *oom_string);
-// landlock.c
-#ifdef HAVE_LANDLOCK
-int landlock_create_ruleset(struct landlock_ruleset_attr *rsattr,size_t size,__u32 flags);
-int landlock_add_rule(int fd,enum landlock_rule_type t,void *attr,__u32 flags);
-int landlock_restrict_self(int fd,__u32 flags);
-int create_full_ruleset();
-int add_read_access_rule_by_path(int rset_fd,char *allowed_path);
-int add_write_access_rule_by_path(int rset_fd,char *allowed_path);
-int add_create_special_rule_by_path(int rset_fd,char *allowed_path);
-int add_execute_rule_by_path(int rset_fd,char *allowed_path);
-#endif
 #endif
diff --git a/src/firejail/join.c b/src/firejail/join.c
index 96d891a49..01fd6c41d 100644
--- a/src/firejail/join.c
+++ b/src/firejail/join.c
@@ -545,7 +545,7 @@ void join(pid_t pid, int argc, char **argv, int index) {
                        dbus_set_system_bus_env();
 #endif
-                start_application(0, shfd, NULL);
+                start_application(arg_join_network || arg_join_filesystem, shfd, NULL);
                __builtin_unreachable();
        }
diff --git a/src/firejail/landlock.c b/src/firejail/landlock.c
deleted file mode 100644
index e79d03280..000000000
--- a/src/firejail/landlock.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2014-2022 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.
-*/
-#ifdef HAVE_LANDLOCK
-#define _GNU_SOURCE
-#include <stdio.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/syscall.h>
-#include <sys/types.h>
-#include <sys/prctl.h>
-#include <linux/prctl.h>
-#include <linux/landlock.h>
-int landlock_create_ruleset(struct landlock_ruleset_attr *rsattr,size_t size,__u32 flags) {
-        return syscall(__NR_landlock_create_ruleset,rsattr,size,flags);
-}
-int landlock_add_rule(int fd,enum landlock_rule_type t,void *attr,__u32 flags) {
-        return syscall(__NR_landlock_add_rule,fd,t,attr,flags);
-}
-int landlock_restrict_self(int fd,__u32 flags) {
-        prctl(PR_SET_NO_NEW_PRIVS,1,0,0,0);
-        int result = syscall(__NR_landlock_restrict_self,fd,flags);
-        if (result!=0) return result;
-        else {
-                close(fd);
-                return 0;
-        }
-}
-int create_full_ruleset() {
-        struct landlock_ruleset_attr attr;
-        attr.handled_access_fs = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR | LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK | LANDLOCK_ACCESS_FS_MAKE_SYM | LANDLOCK_ACCESS_FS_EXECUTE;
-        return landlock_create_ruleset(&attr,sizeof(attr),0);
-}
-int add_read_access_rule_by_path(int rset_fd,char *allowed_path) {
-        int result;
-        int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC);
-        struct landlock_path_beneath_attr target;
-        target.parent_fd = allowed_fd;
-        target.allowed_access = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR;
-        result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0);
-        close(allowed_fd);
-        return result;
-}
-int add_write_access_rule_by_path(int rset_fd,char *allowed_path) {
-        int result;
-        int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC);
-        struct landlock_path_beneath_attr target;
-        target.parent_fd = allowed_fd;
-        target.allowed_access = LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SYM;
-        result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0);
-        close(allowed_fd);
-        return result;
-}
-int add_create_special_rule_by_path(int rset_fd,char *allowed_path) {
-        int result;
-        int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC);
-        struct landlock_path_beneath_attr target;
-        target.parent_fd = allowed_fd;
-        target.allowed_access = LANDLOCK_ACCESS_FS_MAKE_SOCK | LANDLOCK_ACCESS_FS_MAKE_FIFO | LANDLOCK_ACCESS_FS_MAKE_BLOCK;
-        result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0);
-        close(allowed_fd);
-        return result;
-}
-int add_execute_rule_by_path(int rset_fd,char *allowed_path) {
-        int result;
-        int allowed_fd = open(allowed_path,O_PATH | O_CLOEXEC);
-        struct landlock_path_beneath_attr target;
-        target.parent_fd = allowed_fd;
-        target.allowed_access = LANDLOCK_ACCESS_FS_EXECUTE;
-        result = landlock_add_rule(rset_fd,LANDLOCK_RULE_PATH_BENEATH,&target,0);
-        close(allowed_fd);
-        return result;
-}
-#endif
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 1daf0da35..12c2cf02b 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -81,11 +81,6 @@ int arg_seccomp_postexec = 0;			// need postexec ld.preload library?
 int arg_seccomp_block_secondary = 0;            // block any secondary architectures
 int arg_seccomp_error_action = 0;
-#ifdef HAVE_LANDLOCK
-int arg_landlock = -1;                          // Landlock ruleset file descriptor (-1 if it doesn't exist)
-int arg_landlock_proc = 0;                              // Landlock rule for accessing /proc (0 for no access, 1 for read-only and 2 for read-write)
-#endif
 int arg_caps_default_filter = 0;                        // enable default capabilities filter
 int arg_caps_drop = 0;                          // drop list
 int arg_caps_drop_all = 0;                      // drop all capabilities
@@ -829,7 +824,6 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                        // try to join by name only
                        pid_t pid;
                        if (!read_pid(argv[i] + 16, &pid)) {
                                join(pid, argc, argv, i + 1);
                                exit(0);
                        }
@@ -848,6 +842,10 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                                exit(1);
                        }
+                        if (argc <= (i+1))
+                                just_run_the_shell = 1;
+                        cfg.original_program_index = i + 1;
                        // join sandbox by pid or by name
                        pid_t pid = require_pid(argv[i] + 15);
                        join(pid, argc, argv, i + 1);
@@ -865,6 +863,10 @@ static void run_cmd_and_exit(int i, int argc, char **argv) {
                        exit(1);
                }
+                if (argc <= (i+1))
+                        just_run_the_shell = 1;
+                cfg.original_program_index = i + 1;
                // join sandbox by pid or by name
                pid_t pid = require_pid(argv[i] + 18);
                join(pid, argc, argv, i + 1);
@@ -1407,82 +1409,6 @@ int main(int argc, char **argv, char **envp) {
                        else
                                exit_err_feature("seccomp");
                }
-#ifdef HAVE_LANDLOCK
-                else if (strcmp(argv[i], "--landlock") == 0) {
-                        if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                        const char *home_dir = env_get("HOME");
-                        int home_fd = open(home_dir,O_PATH | O_CLOEXEC);
-                        struct landlock_path_beneath_attr target;
-                        target.parent_fd = home_fd;
-                        target.allowed_access = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR | LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SYM;
-                        if (landlock_add_rule(arg_landlock,LANDLOCK_RULE_PATH_BENEATH,&target,0)) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        close(home_fd);
-                        if (add_read_access_rule_by_path(arg_landlock, "/bin/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_execute_rule_by_path(arg_landlock, "/bin/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_read_access_rule_by_path(arg_landlock, "/dev/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_read_access_rule_by_path(arg_landlock, "/etc/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_read_access_rule_by_path(arg_landlock, "/lib/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_execute_rule_by_path(arg_landlock, "/lib/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_read_access_rule_by_path(arg_landlock, "/opt/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_execute_rule_by_path(arg_landlock, "/opt/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_read_access_rule_by_path(arg_landlock, "/usr/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_execute_rule_by_path(arg_landlock, "/usr/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                        if (add_read_access_rule_by_path(arg_landlock, "/var/")) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                }
-                else if (strncmp(argv[i], "--landlock.proc=", 16) == 0) {
-                        if (strncmp(argv[i]+16, "no", 2) == 0) arg_landlock_proc = 0;
-                        else if (strncmp(argv[i]+16, "ro", 2) == 0) arg_landlock_proc = 1;
-                        else if (strncmp(argv[i]+16, "rw", 2) == 0) arg_landlock_proc = 2;
-                }
-                else if (strncmp(argv[i], "--landlock.read=", 16) == 0) {
-                        if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                        if (add_read_access_rule_by_path(arg_landlock, argv[i]+16)) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                }
-                else if (strncmp(argv[i], "--landlock.write=", 17) == 0) {
-                        if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                        if (add_write_access_rule_by_path(arg_landlock, argv[i]+17)) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                }
-                else if (strncmp(argv[i], "--landlock.special=", 17) == 0) {
-                        if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                        if (add_create_special_rule_by_path(arg_landlock, argv[i]+17)) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                }
-                else if (strncmp(argv[i], "--landlock.execute=", 19) == 0) {
-                        if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                        if (add_execute_rule_by_path(arg_landlock, argv[i]+19)) {
-                                fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                        }
-                }
-#endif
                else if (strcmp(argv[i], "--memory-deny-write-execute") == 0) {
                        if (checkcfg(CFG_SECCOMP))
                                arg_memory_deny_write_execute = 1;
@@ -3301,7 +3227,7 @@ int main(int argc, char **argv, char **envp) {
                                errExit("setresuid");
                        char arg[64];
-                        snprintf(arg, sizeof(arg), "--netlock=%d", getpid());
+                        snprintf(arg, sizeof(arg), "--netlock=%d", sandbox_pid);
                        char *cmd[3];
                        cmd[0] = BINDIR "/firejail";
diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 9f677c11d..641bb09b1 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -1047,90 +1047,6 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
                return 0;
        }
-#ifdef HAVE_LANDLOCK
-        // Landlock ruleset paths
-        if (strcmp(ptr, "landlock") == 0) {
-                if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                const char *home_dir = env_get("HOME");
-                int home_fd = open(home_dir,O_PATH | O_CLOEXEC);
-                struct landlock_path_beneath_attr target;
-                target.parent_fd = home_fd;
-                target.allowed_access = LANDLOCK_ACCESS_FS_READ_FILE | LANDLOCK_ACCESS_FS_READ_DIR | LANDLOCK_ACCESS_FS_WRITE_FILE | LANDLOCK_ACCESS_FS_REMOVE_FILE | LANDLOCK_ACCESS_FS_REMOVE_DIR | LANDLOCK_ACCESS_FS_MAKE_CHAR | LANDLOCK_ACCESS_FS_MAKE_DIR | LANDLOCK_ACCESS_FS_MAKE_REG | LANDLOCK_ACCESS_FS_MAKE_SYM;
-                if (landlock_add_rule(arg_landlock,LANDLOCK_RULE_PATH_BENEATH,&target,0)) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                close(home_fd);
-                if (add_read_access_rule_by_path(arg_landlock, "/bin/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_execute_rule_by_path(arg_landlock, "/bin/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_read_access_rule_by_path(arg_landlock, "/dev/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_read_access_rule_by_path(arg_landlock, "/etc/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_read_access_rule_by_path(arg_landlock, "/lib/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_execute_rule_by_path(arg_landlock, "/lib/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_read_access_rule_by_path(arg_landlock, "/opt/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_execute_rule_by_path(arg_landlock, "/opt/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_read_access_rule_by_path(arg_landlock, "/usr/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_execute_rule_by_path(arg_landlock, "/usr/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                if (add_read_access_rule_by_path(arg_landlock, "/var/")) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                return 0;
-        }
-        if (strncmp(ptr, "landlock.proc ", 14) == 0) {
-                        if (strncmp(ptr+14, "no", 2) == 0) arg_landlock_proc = 0;
-                        else if (strncmp(ptr+14, "ro", 2) == 0) arg_landlock_proc = 1;
-                        else if (strncmp(ptr+14, "rw", 2) == 0) arg_landlock_proc = 2;
-                        return 0;
-                }
-        if (strncmp(ptr, "landlock.read ", 14) == 0) {
-                if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                if (add_read_access_rule_by_path(arg_landlock, ptr+14)) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                return 0;
-        }
-        if (strncmp(ptr, "landlock.write ", 15) == 0) {
-                if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                if (add_write_access_rule_by_path(arg_landlock, ptr+15)) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                return 0;
-        }
-        if (strncmp(ptr, "landlock.special ", 26) == 0) {
-                if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                if (add_create_special_rule_by_path(arg_landlock, ptr+26)) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                return 0;
-        }
-        if (strncmp(ptr, "landlock.execute ", 17) == 0) {
-                if (arg_landlock == -1) arg_landlock = create_full_ruleset();
-                if (add_execute_rule_by_path(arg_landlock, ptr+17)) {
-                        fprintf(stderr,"An error has occured while adding a rule to the Landlock ruleset.\n");
-                }
-                return 0;
-        }
-#endif
        // memory deny write&execute
        if (strcmp(ptr, "memory-deny-write-execute") == 0) {
                if (checkcfg(CFG_SECCOMP))
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index 5fcccbd92..9299268a3 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -488,7 +488,6 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) {
 #ifdef HAVE_APPARMOR
                set_apparmor();
 #endif
                close_file_descriptors();
                // set nice and rlimits
@@ -510,16 +509,6 @@ void start_application(int no_sandbox, int fd, char *set_sandbox_status) {
                printf("LD_PRELOAD=%s\n", getenv("LD_PRELOAD"));
        }
-#ifdef HAVE_LANDLOCK
-                // set Landlock
-                if (arg_landlock >= 0) {
-                        if (landlock_restrict_self(arg_landlock,0)) {
-                                fprintf(stderr,"An error has occured while enabling Landlock self-restriction. Exiting...\n");
-                                exit(1); // it isn't safe to continue if Landlock self-restriction was enabled and the "landlock_restrict_self" syscall has failed
-                        }
-                }
-#endif
        if (just_run_the_shell) {
                char *arg[2];
                arg[0] = cfg.usershell;
@@ -1010,15 +999,6 @@ int sandbox(void* sandbox_arg) {
        fs_proc_sys_dev_boot();
        //****************************
-        // Allow access to /proc
-        //****************************
-#ifdef HAVE_LANDLOCK
-        if (arg_landlock>-1) {
-                if (arg_landlock_proc >= 1) add_read_access_rule_by_path(arg_landlock, "/proc/");
-                if (arg_landlock_proc == 2) add_write_access_rule_by_path(arg_landlock, "/proc/");
-}
-#endif
-        //****************************
        // handle /mnt and /media
        //****************************
        if (checkcfg(CFG_DISABLE_MNT))
@@ -1113,12 +1093,9 @@ int sandbox(void* sandbox_arg) {
        //****************************
        // rebuild etc directory, set dns
        //****************************
-        if (!arg_writable_etc){
+        if (!arg_writable_etc)
                fs_rebuild_etc();
-#ifdef HAVE_LANDLOCK
-                if (arg_landlock>-1) add_read_access_rule_by_path(arg_landlock, "/etc/");
-#endif
-        }
        //****************************
        // start dhcp client
        //****************************
diff --git a/src/firejail/usage.c b/src/firejail/usage.c
index e0751ef5c..e11081eed 100644
--- a/src/firejail/usage.c
+++ b/src/firejail/usage.c
@@ -122,12 +122,6 @@ static char *usage_str =
        "    --keep-dev-shm - /dev/shm directory is untouched (even with --private-dev).\n"
        "    --keep-fd - inherit open file descriptors to sandbox.\n"
        "    --keep-var-tmp - /var/tmp directory is untouched.\n"
-        "    --landlock - add basic rules to the Landlock ruleset.\n"
-        "    --landlock.proc=no|ro|rw - add an access rule for /proc to the Landlock ruleset.\n"
-        "    --landlock.read=path - add a read access rule for the path to the Landlock ruleset.\n"
-        "    --landlock.write=path - add a write access rule for the path to the Landlock ruleset.\n"
-        "    --landlock.special=path - add an access rule for creating FIFO pipes, Unix domain sockets and block devices for the path to the Landlock ruleset.\n"
-        "    --landlock.execute=path - add an execution-permitting rule for the path to the Landlock ruleset.\n"
        "    --list - list all sandboxes.\n"
 #ifdef HAVE_FILE_TRANSFER
        "    --ls=name|pid dir_or_filename - list files in sandbox container.\n"
diff --git a/src/firejail/util.c b/src/firejail/util.c
index b6a7ca08c..a01290cf2 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -1338,10 +1338,6 @@ void close_all(int *keep_list, size_t sz) {
                if (keep)
                        continue;
-                // don't close the file descriptor of the Landlock ruleset -- it will be automatically closed by the landlock_restrict_self wrapper function
-#ifdef HAVE_LANDLOCK
-                if (fd == arg_landlock) continue;
-#endif
                close(fd);
        }
        closedir(dir);
diff --git a/src/fnettrace/static-ip-map b/src/fnettrace/static-ip-map
index 97bed7a1f..d1ce29dac 100644
--- a/src/fnettrace/static-ip-map
+++ b/src/fnettrace/static-ip-map
@@ -33,6 +33,11 @@
 #
 #
+#
+# The following list of addresses was compiled from various public sources.
+#
 # local network addresses
 192.168.0.0/16 local network
 10.0.0.0/8 local network
@@ -81,19 +86,89 @@
 201.159.220.0/22 whois.lacnic.net Ecuador
 # some popular websites
+23.160.0.0/24 Twitch
+23.246.0.0/18, Netflix
 31.13.24.0/21 Facebook
 31.13.64.0/18 Facebook
+37.77.184.0/21 Netflix
+45.57.0.0/17 Netflix
+45.58.64.0/20 Dropbox
+45.113.128.0/22 Twitch
+52.223.192.0/18 Twitch
+63.245.208.0/23 Mozilla
 64.63.0.0/18 Twitter
+64.112.13.0/24 Dropbox
+64.120.128.0/17 Netflix
+66.197.128.0/17 Netflix
+69.53.224.0/19 Netflix
 69.171.224.0/19 Facebook
+91.105.192.0/23 Telegram
+91.108.4.0/22 Telegram
+91.108.8.0/21 Telegram
+91.108.16.0/21 Telegram
+91.108.56.0/22 Telegram
+91.189.88.0/24 Ubuntu One
+91.189.90.0/23 Ubuntu One
+91.189.92.0/23 Ubuntu One
+91.189.94.0/24 Ubuntu One
+95.161.64.0/20 Telegram
+99.181.64.0/18 Twitch
+103.53.48.0/23 Twitch
 104.244.40.0/21 Twitter
 129.134.0.0/16 Facebook
 140.82.112.0/20 GitHub
+103.10.124.0/23 Steam
+103.28.54.0/24 Steam
+108.160.160.0/20 Dropbox
+108.175.32.0/20 Netflix
+143.55.64.0/20 Github
+146.66.152.0/24 Steam
+146.66.155.0/24 Steam
+149.154.160.0/20 Telegram
+153.254.86.0/24 Steam
+155.133.224.0/22 Steam
+155.133.230.0/24 Steam
+155.133.232.0/23 Steam
+155.133.234.0/24 Steam
+155.133.236.0/22 Steam
+155.133.240.0/23 Steam
+155.133.245.0/24 Steam
+155.133.246.0/24 Steam
+155.133.248.0/21 Steam
 157.240.0.0/16 Facebook
+162.125.0.0/16 Dropbox
+162.213.32.0/22 Ubuntu One
+162.254.192.0/21 Steam
+185.2.220.0/22 Netflix
+185.9.188.0/22 Netflix
+185.25.182.0/23 Steam
+185.42.204.0/22 Twitch
+185.45.8.0/22 Dropbox
+185.76.151.0/24 Telegram
+185.105.164.0/24 Dropbox
+185.125.188.0/22 Ubuntu One
 185.199.108.0/22 GitHub
 188.64.224.0/21 Twitter
+190.217.33.0/24 Steam
 192.0.64.0/18 Wordpress
+192.16.64.0/21 Twitch
+192.30.252.0/22 GitHub
+192.69.96.0/22 Steam
+192.108.239.0/24 Twitch
+192.173.64.0/18 Netflix
+192.189.200.0/23 Dropbox
+194.169.254.0/24 Ubuntu One
+198.38.96.0/19 Netflix
+198.45.48.0/20 Netflix
+199.9.248.0/21 Twitch
 199.16.156.0/22 Twitter
 199.59.148.0/22 Twitter
+205.185.194.0/24 Steam
+205.196.6.0/24 Steam
+207.45.72.0/22 Netflix
+208.64.200.0/22 Steam
+208.75.76.0/22 Netflix
+208.78.164.0/22 Steam
 208.80.152.0/22 Wikipedia
 # StackPath
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 1f543980e..138aae8af 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -497,35 +497,6 @@ Blacklist all Linux capabilities.
 .TP
 \fBcaps.keep capability,capability,capability
 Whitelist given Linux capabilities.
-#ifdef HAVE_LANDLOCK
-.TP
-\fBlandlock
-Create a Landlock ruleset (if it doesn't already exist) and add basic access rules to it.
-.br
-.TP
-\fBlandlock.proc no|ro|rw
-Add an access rule for /proc directory (read-only if set to \fBro\fR and read-write if set to \fBrw\fR). The access rule for /proc is added after this directory is set up in the sandbox. Access rules for /proc set up with other Landlock-related profile options have no effect.
-.br
-.TP
-\fBlandlock.read path
-Create a Landlock ruleset (if it doesn't already exist) and add a read access rule for path.
-.br
-.TP
-\fBlandlock.write path
-Create a Landlock ruleset (if it doesn't already exist) and add a write access rule for path.
-.br
-.TP
-\fBlandlock.special path
-Create a Landlock ruleset (if it doesn't already exist) and add an access rule for creation of FIFO pipes, Unix-domain sockets and block devices beneath given path.
-.br
-.TP
-\fBlandlock.execute path
-Create a Landlock ruleset (if it doesn't already exist) and add an execution permission rule for path.
-.br
-#endif
 .TP
 \fBmemory-deny-write-execute
 Install a seccomp filter to block attempts to create memory mappings
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 0b78203d7..82eea3977 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -193,7 +193,7 @@ Blacklist directory or file. File globbing is supported, see \fBFILE GLOBBING\fR
 .br
 Symbolic link handling: Blacklisting a path that is a symbolic link will also
 blacklist the path that it points to.
-For example, if ~/foo is blacklisted and it points to /foo, then /foo will also
+For example, if ~/foo is blacklisted and it points to /bar, then /bar will also
 be blacklisted.
 .br
@@ -330,6 +330,11 @@ $ firejail \-\-chroot=/media/ubuntu warzone2100
 .br
 For automatic mounting of X11 and PulseAudio sockets set environment variables
 FIREJAIL_CHROOT_X11 and FIREJAIL_CHROOT_PULSE.
+.br
+.br
+Note: Support for this command is controlled in firejail.config with the
+\fBchroot\fR option.
 #endif
 .TP
 \fB\-\-cpu=cpu-number,cpu-number,cpu-number
@@ -1151,41 +1156,6 @@ Example:
 .br
 $ firejail --keep-var-tmp
-#ifdef HAVE_LANDLOCK
-.TP
-\fB\-\-landlock
-Create a Landlock ruleset (if it doesn't already exist) and add basic access rules to it. See \fBLANDLOCK\fR section for more information.
-.br
-.TP
-\fB\-\-landlock.proc=no|ro|rw
-Add an access rule for /proc directory (read-only if set to \fBro\fR and read-write if set to \fBrw\fR). The access rule for /proc is added after this directory is set up in the sandbox. Access rules for /proc set up with other Landlock-related command-line options have no effect.
-.br
-.TP
-\fB\-\-landlock.read=path
-Create a Landlock ruleset (if it doesn't already exist) and add a read access rule for path.
-.br
-.TP
-\fB\-\-landlock.write=path
-Create a Landlock ruleset (if it doesn't already exist) and add a write access rule for path. 
-.br
-.TP
-\fB\-\-landlock.special=path
-Create a Landlock ruleset (if it doesn't already exist) and add a permission rule to create FIFO pipes, Unix domain sockets and block devices beneath given path.
-.br
-.TP
-\fB\-\-landlock.execute=path
-Create a Landlock ruleset (if it doesn't already exist) and add an execution permission rule for path.
-.br
-.br
-Example:
-.br
-$ firejail \-\-landlock.read=/ \-\-landlock.write=/home \-\-landlock.execute=/usr
-#endif
 .TP
 \fB\-\-list
 List all sandboxes, see \fBMONITORING\fR section for more details.
@@ -1303,7 +1273,6 @@ $ firejail --list
 .br
 1312:netblue:browser-1312:firejail --name=browser --private firefox --no-remote
 .br
 #ifdef HAVE_NETWORK
 .TP
 \fB\-\-net=bridge_interface
@@ -2166,6 +2135,9 @@ $ ps
 $
 .br
+.br
+Note: Support for this command is controlled in firejail.config with the
+\fBprivate-lib\fR option.
 .TP
 \fB\-\-private-opt=file,directory
 Build a new /opt in a temporary
@@ -2873,6 +2845,11 @@ Dec  3 11:43:25 debian firejail[70]: blacklist violation - sandbox 26370, exe fi
 Dec  3 11:46:17 debian firejail[70]: blacklist violation - sandbox 26370, exe firefox, syscall opendir, path /boot
 .br
 [...]
+.br
+.br
+Note: Support for this command is controlled in firejail.config with the
+\fBtracelog\fR option.
 .TP
 \fB\-\-tree
 Print a tree of all sandboxed processes, see \fBMONITORING\fR section for more details.
@@ -3237,34 +3214,7 @@ To enable AppArmor confinement on top of your current Firejail security features
 .br
 $ firejail --apparmor firefox
 #endif
-#ifdef HAVE_LANDLOCK
-.SH LANDLOCK
-.TP
-Landlock is a Linux security module first introduced in the 5.13 version of Linux kernel. It allows unprivileged processes to restrict their access to the filesystem. Once imposed, these restrictions can never be removed, and all child processes created by a Landlock-restricted processes inherit these restrictions. Firejail supports Landlock as an additional sandboxing feature. It can be used to ensure that a sandboxed application can only access files and directories that it was explicitly allowed to access. Firejail supports populating the ruleset with both basic set of rules and with custom set of rules. Basic set of rules allows read-only access to /bin, /dev, /etc, /lib, /opt, /proc, /usr and /var, read-write access to the home directory, and allows execution of binaries located in /bin, /opt and /usr.
-.br
-.TP
-Important notes:
-.br
-.br
- A process can install a Landlock ruleset only if it has either \fBCAP_SYS_ADMIN\fR in its effective capability set, or the "No New Privileges" restriction enabled. Because of this, enabling the Landlock feature will also cause Firejail to enable the "No New Privileges" restriction, regardless of the profile or the \fB\-\-no\-new\-privs\fR command line option.
-.br
-.br
- Access to the /proc directory is managed through the \fB\-\-landlock.proc\fR command line option.
-.br
- Access to the /etc directory is automatically allowed. To override this, use the \fB\-\-writable\-etc\fR command line option. You can also use the \fB\-\-private\-etc\fR option to restrict access to the /etc directory.
-.br
-.TP
-To enable Landlock self-restriction on top of your current Firejail security features, pass \fB\-\-landlock\fR flag to Firejail command line. You can also use \fB\-\-landlock.read\fR, \fB\-\-landlock.write\fR, \fB\-\-landlock.special\fR and \fB\-\-landlock.execute\fR options together with \fB\-\-landlock\fR or instead of it. Example:
-.br
-.br
-$ firejail --landlock --landlock.read=/media --landlock.proc=ro mc
-#endif
 .SH DESKTOP INTEGRATION
 A symbolic link to /usr/bin/firejail under the name of a program, will start the program in Firejail sandbox.
 The symbolic link should be placed in the first $PATH position. On most systems, a good place
diff --git a/src/zsh_completion/_firejail.in b/src/zsh_completion/_firejail.in
index ed7337762..2b67c2a00 100644
--- a/src/zsh_completion/_firejail.in
+++ b/src/zsh_completion/_firejail.in
@@ -105,12 +105,6 @@ _firejail_args=(
    '--keep-dev-shm[/dev/shm directory is untouched (even with --private-dev)]'
    '--keep-fd[inherit open file descriptors to sandbox]: :'
    '--keep-var-tmp[/var/tmp directory is untouched]'
-    '--landlock[Basic Landlock ruleset]'
-    '--landlock.proc=-[Access to the /proc directory]: :(no ro rw)'
-    '--landlock.read=-[Landlock read access rule]: :_files'
-    '--landlock.write=-[Landlock write access rule]: :_files'
-    "--landlock.special=-[Landlock access rule for creation of FIFO pipes, sockets and block devices]: :_files"
-    '--landlock.execute=-[Landlock execution-permitting rule]: :_files'
    '--machine-id[spoof /etc/machine-id with a random id]'
    '--memory-deny-write-execute[seccomp filter to block attempts to create memory mappings that are both writable and executable]'
    '*--mkdir=-[create a directory]:'
diff --git a/test/appimage/appimage.sh b/test/appimage/appimage.sh
index 9afacf5be..c2bdad012 100755
--- a/test/appimage/appimage.sh
+++ b/test/appimage/appimage.sh
@@ -13,7 +13,7 @@ echo "TESTING: AppImage v1 (test/appimage/appimage-v1.exp)"
 echo "TESTING: AppImage v2 (test/appimage/appimage-v2.exp)"
 ./appimage-v2.exp
-echo "TESTING: AppImage file name (test/appimage/filename.exp)";
+echo "TESTING: AppImage file name (test/appimage/filename.exp)"
 ./filename.exp
 echo "TESTING: AppImage argsv1 (test/appimage/appimage-args.exp)"
diff --git a/test/apps-x11-xorg/apps-x11-xorg.sh b/test/apps-x11-xorg/apps-x11-xorg.sh
index 9ed123979..9dcee7aff 100755
--- a/test/apps-x11-xorg/apps-x11-xorg.sh
+++ b/test/apps-x11-xorg/apps-x11-xorg.sh
@@ -7,8 +7,7 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-which firefox 2>/dev/null
+if command -v firefox
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: firefox x11 xorg"
        ./firefox.exp
@@ -16,8 +15,7 @@ else
        echo "TESTING SKIP: firefox not found"
 fi
-which transmission-gtk 2>/dev/null
+if command -v transmission-gtk
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: transmission-gtk x11 xorg"
        ./transmission-gtk.exp
@@ -25,8 +23,7 @@ else
        echo "TESTING SKIP: transmission-gtk not found"
 fi
-which transmission-qt 2>/dev/null
+if command -v transmission-qt
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: transmission-qt x11 xorg"
        ./transmission-qt.exp
@@ -34,8 +31,7 @@ else
        echo "TESTING SKIP: transmission-qt not found"
 fi
-which thunderbird 2>/dev/null
+if command -v thunderbird
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: thunderbird x11 xorg"
        ./thunderbird.exp
diff --git a/test/apps-x11/apps-x11.sh b/test/apps-x11/apps-x11.sh
index a3c946ca4..b2722eed3 100755
--- a/test/apps-x11/apps-x11.sh
+++ b/test/apps-x11/apps-x11.sh
@@ -10,49 +10,42 @@ export LC_ALL=C
 echo "TESTING: no x11 (test/apps-x11/x11-none.exp)"
 ./x11-none.exp
+if command -v xterm
-which xterm 2>/dev/null
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: xterm x11 xorg"
        ./xterm-xorg.exp
-        which xpra 2>/dev/null
+        if command -v xpra
-        if [ "$?" -eq 0 ];
        then
-        echo "TESTING: xterm x11 xpra"
+                echo "TESTING: xterm x11 xpra"
-        ./xterm-xpra.exp
+                ./xterm-xpra.exp
        fi
-        which Xephyr 2>/dev/null
+        if command -v Xephyr
-        if [ "$?" -eq 0 ];
        then
-        echo "TESTING: xterm x11 xephyr"
+                echo "TESTING: xterm x11 xephyr"
-        ./xterm-xephyr.exp
+                ./xterm-xephyr.exp
        fi
 else
        echo "TESTING SKIP: xterm not found"
 fi
 # check xpra/xephyr
-which xpra 2>/dev/null
+if command -v xpra
-if [ "$?" -eq 0 ];
 then
-        echo "xpra found"
+        echo "xpra found"
 else
-        echo "xpra not found"
+        echo "xpra not found"
-        which Xephyr 2>/dev/null
+        if command -v Xephyr
-        if [ "$?" -eq 0 ];
        then
-                echo "Xephyr found"
+                echo "Xephyr found"
        else
-                echo "TESTING SKIP: xpra and/or Xephyr not found"
+                echo "TESTING SKIP: xpra and/or Xephyr not found"
                exit
        fi
 fi
-which firefox 2>/dev/null
+if command -v firefox
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: firefox x11"
        ./firefox.exp
@@ -60,8 +53,7 @@ else
        echo "TESTING SKIP: firefox not found"
 fi
-which chromium 2>/dev/null
+if command -v chromium
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: chromium x11"
        ./chromium.exp
@@ -69,8 +61,7 @@ else
        echo "TESTING SKIP: chromium not found"
 fi
-which transmission-gtk 2>/dev/null
+if command -v transmission-gtk
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: transmission-gtk x11"
        ./transmission-gtk.exp
@@ -78,8 +69,7 @@ else
        echo "TESTING SKIP: transmission-gtk not found"
 fi
-which thunderbird 2>/dev/null
+if command -v thunderbird
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: thunderbird x11"
        ./thunderbird.exp
diff --git a/test/apps/apps.sh b/test/apps/apps.sh
index 83e977ba0..0ef01bf2e 100755
--- a/test/apps/apps.sh
+++ b/test/apps/apps.sh
@@ -7,12 +7,10 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-LIST="firefox midori chromium opera transmission-qt qbittorrent uget-gtk filezilla gthumb thunderbird "
+apps=(firefox midori chromium opera transmission-qt qbittorrent uget-gtk filezilla gthumb thunderbird vlc fbreader deluge gnome-mplayer xchat wine kcalc ktorrent hexchat)
-LIST+="vlc fbreader deluge gnome-mplayer xchat wine kcalc ktorrent hexchat"
-for app in $LIST; do
+for app in "${apps[@]}"; do
-        which $app 2>/dev/null
+        if command -v "$app"
-        if [ "$?" -eq 0 ];
        then
                echo "TESTING: $app"
                ./$app.exp
diff --git a/test/chroot/chroot.sh b/test/chroot/chroot.sh
index 3c3e7311b..f5ccf3549 100755
--- a/test/chroot/chroot.sh
+++ b/test/chroot/chroot.sh
@@ -17,6 +17,4 @@ echo "TESTING: chroot (test/chroot/fs_chroot.exp)"
 echo "TESTING: unchroot as root (test/chroot/unchroot-as-root.exp)"
 sudo ./unchroot-as-root.exp
 rm -f unchroot
diff --git a/test/compile/compile.sh b/test/compile/compile.sh
index 6b994ba70..0285c8935 100755
--- a/test/compile/compile.sh
+++ b/test/compile/compile.sh
@@ -31,7 +31,7 @@ arr[15]="TEST 15: compile private-home disabled"
 arr[16]="TEST 16: compile disable manpages"
 arr[17]="TEST 17: disable tmpfs as regular user"
 arr[18]="TEST 18: disable private home"
-arr[18]="TEST 19: enable ids"
+arr[19]="TEST 19: enable ids"
 # remove previous reports and output file
 cleanup() {
@@ -47,23 +47,23 @@ print_title() {
        echo
        echo
        echo "**************************************************"
-        echo $1
+        echo "$1"
        echo "**************************************************"
 }
 DIST="$1"
-while [ $# -gt 0 ]; do    # Until you run out of parameters . . .
+while [[ $# -gt 0 ]]; do    # Until you run out of parameters . . .
-    case "$1" in
+        case "$1" in
-    --clean)
+        --clean)
-        cleanup
+                cleanup
-        exit
+                exit
-        ;;
+                ;;
-    --help)
+        --help)
-        echo "./compile.sh [--clean|--help]"
+                echo "./compile.sh [--clean|--help]"
-        exit
+                exit
-        ;;
+                ;;
-    esac
+        esac
-    shift       # Check next set of parameters.
+        shift       # Check next set of parameters.
 done
 cleanup
@@ -76,8 +76,8 @@ cleanup
 #*****************************************************************
 print_title "${arr[1]}"
 echo "$DIST"
-tar -xJvf ../../$DIST.tar.xz
+tar -xJvf ../../"$DIST.tar.xz"
-mv $DIST firejail
+mv "$DIST" firejail
 cd firejail
 ./configure --prefix=/usr --enable-fatal-warnings 2>&1 | tee ../output-configure
@@ -89,7 +89,6 @@ cp output-configure oc1
 cp output-make om1
 rm output-configure output-make
 #*****************************************************************
 # TEST 2
 #*****************************************************************
@@ -98,7 +97,7 @@ rm output-configure output-make
 print_title "${arr[2]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-dbusproxy  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-dbusproxy --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test2
@@ -115,7 +114,7 @@ rm output-configure output-make
 print_title "${arr[3]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-chroot  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-chroot --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test3
@@ -132,7 +131,7 @@ rm output-configure output-make
 print_title "${arr[4]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-firetunnel  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-firetunnel --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test4
@@ -149,7 +148,7 @@ rm output-configure output-make
 print_title "${arr[5]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-userns  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-userns --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test5
@@ -167,7 +166,7 @@ rm output-configure output-make
 print_title "${arr[6]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-network  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-network --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test6
@@ -184,7 +183,7 @@ rm output-configure output-make
 print_title "${arr[7]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-x11  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-x11 --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test7
@@ -218,7 +217,7 @@ rm output-configure output-make
 print_title "${arr[9]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-file-transfer  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-file-transfer --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test9
@@ -235,7 +234,7 @@ rm output-configure output-make
 print_title "${arr[10]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-whitelist  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-whitelist --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test10
@@ -252,7 +251,7 @@ rm output-configure output-make
 print_title "${arr[11]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --disable-globalcfg  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-globalcfg --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test11
@@ -269,7 +268,7 @@ rm output-configure output-make
 print_title "${arr[12]}"
 cd firejail
 make distclean
-./configure --prefix=/usr --enable-apparmor  --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --enable-apparmor --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test12
@@ -354,7 +353,7 @@ rm output-configure output-make
 print_title "${arr[17]}"
 cd firejail
 make distclean
-./configure --prefix=/usr  --disable-usertmpfs --enable-fatal-warnings 2>&1 | tee ../output-configure
+./configure --prefix=/usr --disable-usertmpfs --enable-fatal-warnings 2>&1 | tee ../output-configure
 make -j4 2>&1 | tee ../output-make
 cd ..
 grep Warning output-configure output-make > ./report-test17
@@ -410,23 +409,23 @@ echo "**********************************************************"
 wc -l report-test*
 echo
-echo  "Legend:"
+echo "Legend:"
-echo ${arr[1]}
+echo "${arr[1]}"
-echo ${arr[2]}
+echo "${arr[2]}"
-echo ${arr[3]}
+echo "${arr[3]}"
-echo ${arr[4]}
+echo "${arr[4]}"
-echo ${arr[5]}
+echo "${arr[5]}"
-echo ${arr[6]}
+echo "${arr[6]}"
-echo ${arr[7]}
+echo "${arr[7]}"
-echo ${arr[8]}
+echo "${arr[8]}"
-echo ${arr[9]}
+echo "${arr[9]}"
-echo ${arr[10]}
+echo "${arr[10]}"
-echo ${arr[11]}
+echo "${arr[11]}"
-echo ${arr[12]}
+echo "${arr[12]}"
-echo ${arr[13]}
+echo "${arr[13]}"
-echo ${arr[14]}
+echo "${arr[14]}"
-echo ${arr[15]}
+echo "${arr[15]}"
-echo ${arr[16]}
+echo "${arr[16]}"
-echo ${arr[17]}
+echo "${arr[17]}"
-echo ${arr[18]}
+echo "${arr[18]}"
-echo ${arr[19]}
+echo "${arr[19]}"
diff --git a/test/environment/environment.sh b/test/environment/environment.sh
index da9c170b9..c88c91741 100755
--- a/test/environment/environment.sh
+++ b/test/environment/environment.sh
@@ -7,7 +7,6 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
 echo "TESTING: timeout (test/environment/timeout.exp)"
 ./timeout.exp
@@ -39,13 +38,12 @@ echo "TESTING: environment variables (test/environment/env.exp)"
 echo "TESTING: firejail in firejail - single sandbox (test/environment/firejail-in-firejail.exp)"
 ./firejail-in-firejail.exp
-which aplay 2>/dev/null
+if command -v aplay && [[ $(aplay -l | grep -c "List of PLAYBACK") -gt 0 ]]
-if [ "$?" -eq 0 ] && [ "$(aplay -l | grep -c "List of PLAYBACK")" -gt 0 ];
 then
-        echo "TESTING: sound (test/environment/sound.exp)"
+        echo "TESTING: sound (test/environment/sound.exp)"
-        ./sound.exp
+        ./sound.exp
 else
-        echo "TESTING SKIP: no aplay or sound card found"
+        echo "TESTING SKIP: no aplay or sound card found"
 fi
 echo "TESTING: nice (test/environment/nice.exp)"
@@ -54,26 +52,24 @@ echo "TESTING: nice (test/environment/nice.exp)"
 echo "TESTING: quiet (test/environment/quiet.exp)"
 ./quiet.exp
-which strace 2>/dev/null
+if command -v strace
-if [ "$?" -eq 0 ];
 then
-        echo "TESTING: --allow-debuggers (test/environment/allow-debuggers.exp)"
+        echo "TESTING: --allow-debuggers (test/environment/allow-debuggers.exp)"
-        ./allow-debuggers.exp
+        ./allow-debuggers.exp
 else
-        echo "TESTING SKIP: strace not found"
+        echo "TESTING SKIP: strace not found"
 fi
 # to install ibus:
 #       $ sudo apt-get install ibus-table-array30
 #       $ ibus-setup
-find ~/.config/ibus/bus | grep unix-0
+if find ~/.config/ibus/bus | grep unix-0
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: ibus (test/environment/ibus.exp)"
        ./ibus.exp
 else
-        echo "TESTING SKIP: ibus not configured"
+        echo "TESTING SKIP: ibus not configured"
 fi
 echo "TESTING: rlimit (test/environment/rlimit.exp)"
diff --git a/test/environment/output.sh b/test/environment/output.sh
index 329cb40c7..ba06f9184 100755
--- a/test/environment/output.sh
+++ b/test/environment/output.sh
@@ -5,8 +5,8 @@
 i="0"
-while  [ $i -lt 150000 ]
+while [[ $i -lt 150000 ]]
 do
-        echo message number $i
+        echo "message number $i"
-        i=$[$i+1]
+        i=$((i+1))
 done
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh
index fca599889..72b87d14c 100755
--- a/test/fcopy/fcopy.sh
+++ b/test/fcopy/fcopy.sh
@@ -7,7 +7,7 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-if [ -f /etc/debian_version ]; then
+if [[ -f /etc/debian_version ]]; then
        libdir=$(dirname "$(dpkg -L firejail | grep fcopy)")
        export PATH="$PATH:$libdir"
 fi
@@ -29,4 +29,4 @@ echo "TESTING: fcopy directory (test/fcopy/dircopy.exp)"
 ./dircopy.exp
 rm -fr dest/*
-rm -f src/dircopy.exp
-\ No newline at end of file
+rm -f src/dircopy.exp
diff --git a/test/features/test.sh b/test/features/test.sh
index b507c6d37..44677aaa7 100755
--- a/test/features/test.sh
+++ b/test/features/test.sh
@@ -8,28 +8,25 @@ OVERLAY="overlay"
 CHROOT="chroot"
 NETWORK="network"
-while [ $# -gt 0 ]; do    # Until you run out of parameters . . .
+while [[ $# -gt 0 ]]; do    # Until you run out of parameters . . .
-    case "$1" in
+        case "$1" in
-    --nooverlay)
+        --nooverlay)
-        OVERLAY="none"
+                OVERLAY="none"
-        ;;
+                ;;
-    --nochroot)
+        --nochroot)
-        CHROOT="none"
+                CHROOT="none"
-        ;;
+                ;;
-    --nonetwork)
+        --nonetwork)
-        NETWORK="none"
+                NETWORK="none"
-        ;;
+                ;;
-    --help)
+        --help)
-        echo "./test.sh [--nooverlay|--nochroot|--nonetwork|--help] | grep TESTING"
+                echo "./test.sh [--nooverlay|--nochroot|--nonetwork|--help] | grep TESTING"
-        exit
+                exit
-        ;;
+                ;;
-    esac
+        esac
-    shift       # Check next set of parameters.
+        shift       # Check next set of parameters.
 done
 #
 # Feature testing
 #
@@ -38,85 +35,85 @@ done
 # Default features
 ####################
 echo "TESTING: 1.1 disable /boot"
-./1.1.exp $OVERLAY $CHROOT
+./1.1.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 1.2 new /proc"
-./1.2.exp $OVERLAY $CHROOT
+./1.2.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 1.4 mask other users"
-./1.4.exp $OVERLAY $CHROOT
+./1.4.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 1.5 PID namespace"
-./1.5.exp $OVERLAY $CHROOT
+./1.5.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 1.6 new /var/log"
-./1.6.exp $OVERLAY $CHROOT
+./1.6.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 1.7 new /var/tmp"
-./1.7.exp $OVERLAY $CHROOT
+./1.7.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 1.8 disable firejail config and run time information"
-./1.8.exp $OVERLAY $CHROOT
+./1.8.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 1.10 disable /selinux"
-./1.10.exp $OVERLAY $CHROOT
+./1.10.exp "$OVERLAY" "$CHROOT"
 ####################
 # networking features
 ####################
-if [ $NETWORK == "network" ]
+if [[ $NETWORK == "network" ]]
 then
        echo "TESTING: 2.1 hostname"
-        ./2.1.exp $OVERLAY $CHROOT
+        ./2.1.exp "$OVERLAY" "$CHROOT"
        echo "TESTING: 2.2 DNS"
-        ./2.2.exp $OVERLAY $CHROOT
+        ./2.2.exp "$OVERLAY" "$CHROOT"
        echo "TESTING: 2.3 mac-vlan"
-        ./2.3.exp $OVERLAY $CHROOT
+        ./2.3.exp "$OVERLAY" "$CHROOT"
        echo "TESTING: 2.4 bridge"
-        ./2.4.exp $OVERLAY $CHROOT
+        ./2.4.exp "$OVERLAY" "$CHROOT"
        echo "TESTING: 2.5 interface"
-        ./2.5.exp $OVERLAY $CHROOT
+        ./2.5.exp "$OVERLAY" "$CHROOT"
        echo "TESTING: 2.6 Default gateway"
-        ./2.6.exp $OVERLAY $CHROOT
+        ./2.6.exp "$OVERLAY" "$CHROOT"
 fi
 ####################
 # filesystem features
 ####################
 echo "TESTING: 3.1 private (fails on OpenSUSE)"
-./3.1.exp $OVERLAY $CHROOT
+./3.1.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.2 read-only"
-./3.2.exp $OVERLAY $CHROOT
+./3.2.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.3 blacklist"
-./3.3.exp $OVERLAY $CHROOT
+./3.3.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.4 whitelist home (fails on OpenSUSE)"
-./3.4.exp $OVERLAY $CHROOT
+./3.4.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.5 private-dev"
-./3.5.exp $OVERLAY $CHROOT
+./3.5.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.6 private-etc"
-./3.6.exp notworking $CHROOT
+./3.6.exp notworking "$CHROOT"
 echo "TESTING: 3.7 private-tmp"
-./3.7.exp $OVERLAY $CHROOT
+./3.7.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.8 private-bin"
 ./3.8.exp notworking notworking
 echo "TESTING: 3.9 whitelist dev"
-./3.9.exp $OVERLAY $CHROOT
+./3.9.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.10 whitelist tmp"
-./3.10.exp $OVERLAY $CHROOT
+./3.10.exp "$OVERLAY" "$CHROOT"
 echo "TESTING: 3.11 mkdir"
-./3.11.exp $OVERLAY $CHROOT
+./3.11.exp "$OVERLAY" "$CHROOT"
diff --git a/test/filters/filters.sh b/test/filters/filters.sh
index 04d7080d6..3b4a6b492 100755
--- a/test/filters/filters.sh
+++ b/test/filters/filters.sh
@@ -7,37 +7,37 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-if [ -f /etc/debian_version ]; then
+if [[ -f /etc/debian_version ]]; then
        libdir=$(dirname "$(dpkg -L firejail | grep fseccomp)")
        export PATH="$PATH:$libdir"
 fi
 export PATH="$PATH:/usr/lib/firejail:/usr/lib64/firejail"
-if [ -f /sys/kernel/security/apparmor/profiles ]; then
+if [[ -f /sys/kernel/security/apparmor/profiles ]]; then
        echo "TESTING: apparmor (test/filters/apparmor.exp)"
        ./apparmor.exp
 else
        echo "TESTING SKIP: no apparmor support in Linux kernel (test/filters/apparmor.exp)"
 fi
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-    echo "TESTING: memory-deny-write-execute (test/filters/memwrexe.exp)"
+        echo "TESTING: memory-deny-write-execute (test/filters/memwrexe.exp)"
-    ./memwrexe.exp
+        ./memwrexe.exp
-elif [ "$(uname -m)" = "i686" ]; then
+elif [[ $(uname -m) == "i686" ]]; then
-    echo "TESTING: memory-deny-write-execute (test/filters/memwrexe-32.exp)"
+        echo "TESTING: memory-deny-write-execute (test/filters/memwrexe-32.exp)"
-    ./memwrexe-32.exp
+        ./memwrexe-32.exp
 else
-    echo "TESTING SKIP: memwrexe binary only running on x86_64 and i686."
+        echo "TESTING SKIP: memwrexe binary only running on x86_64 and i686."
 fi
 echo "TESTING: debug options (test/filters/debug.exp)"
 ./debug.exp
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-    echo "TESTING: seccomp run files (test/filters/seccomp-run-files.exp)"
+        echo "TESTING: seccomp run files (test/filters/seccomp-run-files.exp)"
-    ./seccomp-run-files.exp
+        ./seccomp-run-files.exp
 else
-    echo "TESTING SKIP: seccomp-run-files test implemented only for x86_64."
+        echo "TESTING SKIP: seccomp-run-files test implemented only for x86_64."
 fi
 echo "TESTING: seccomp postexec (test/filters/seccomp-postexec.exp)"
@@ -61,33 +61,33 @@ echo "TESTING: capabilities join (test/filters/caps-join.exp)"
 ./caps-join.exp
 rm -f seccomp-test-file
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-       echo "TESTING: fseccomp (test/filters/fseccomp.exp)"
+        echo "TESTING: fseccomp (test/filters/fseccomp.exp)"
-        ./fseccomp.exp
+        ./fseccomp.exp
 else
-        echo "TESTING SKIP: fseccomp test implemented only for x86_64"
+        echo "TESTING SKIP: fseccomp test implemented only for x86_64"
 fi
 rm -f seccomp-test-file
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-        echo "TESTING: protocol (test/filters/protocol.exp)"
+        echo "TESTING: protocol (test/filters/protocol.exp)"
-        ./protocol.exp
+        ./protocol.exp
 else
-        echo "TESTING SKIP: protocol, running only on x86_64"
+        echo "TESTING SKIP: protocol, running only on x86_64"
 fi
 echo "TESTING: seccomp bad empty (test/filters/seccomp-bad-empty.exp)"
 ./seccomp-bad-empty.exp
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-        echo "TESTING: seccomp debug  (test/filters/seccomp-debug.exp)"
+        echo "TESTING: seccomp debug (test/filters/seccomp-debug.exp)"
        ./seccomp-debug.exp
-elif [ "$(uname -m)" = "i686" ]; then
+elif [[ $(uname -m) == "i686" ]]; then
-        echo "TESTING: seccomp debug  (test/filters/seccomp-debug-32.exp)"
+        echo "TESTING: seccomp debug (test/filters/seccomp-debug-32.exp)"
        ./seccomp-debug-32.exp
 else
-        echo "TESTING SKIP: protocol, running only on x86_64 and i686"
+        echo "TESTING SKIP: protocol, running only on x86_64 and i686"
 fi
 echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)"
@@ -96,12 +96,11 @@ echo "TESTING: seccomp errno (test/filters/seccomp-errno.exp)"
 echo "TESTING: seccomp su (test/filters/seccomp-su.exp)"
 ./seccomp-su.exp
-which strace 2>/dev/null
+if command -v strace; then
-if [ $? -eq 0 ]; then
+        echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)"
-        echo "TESTING: seccomp ptrace (test/filters/seccomp-ptrace.exp)"
+        ./seccomp-ptrace.exp
-        ./seccomp-ptrace.exp
 else
-        echo "TESTING SKIP: ptrace, strace not found"
+        echo "TESTING SKIP: ptrace, strace not found"
 fi
 echo "TESTING: seccomp chmod - seccomp lists (test/filters/seccomp-chmod.exp)"
@@ -115,16 +114,16 @@ echo "TESTING: seccomp chmod profile - seccomp lists (test/filters/seccomp-chmod
 echo "TESTING: seccomp empty (test/filters/seccomp-empty.exp)"
 ./seccomp-empty.exp
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-    echo "TESTING: seccomp numeric (test/filters/seccomp-numeric.exp)"
+        echo "TESTING: seccomp numeric (test/filters/seccomp-numeric.exp)"
-    ./seccomp-numeric.exp
+        ./seccomp-numeric.exp
 else
-        echo "TESTING SKIP: seccomp numeric test implemented only for x86_64"
+        echo "TESTING SKIP: seccomp numeric test implemented only for x86_64"
 fi
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-       echo "TESTING: seccomp join (test/filters/seccomp-join.exp)"
+        echo "TESTING: seccomp join (test/filters/seccomp-join.exp)"
-        ./seccomp-join.exp
+        ./seccomp-join.exp
 else
-        echo "TESTING SKIP: seccomp join test implemented only for x86_64"
+        echo "TESTING SKIP: seccomp join test implemented only for x86_64"
 fi
diff --git a/test/fnetfilter/fnetfilter.sh b/test/fnetfilter/fnetfilter.sh
index 9ad822753..52f921232 100755
--- a/test/fnetfilter/fnetfilter.sh
+++ b/test/fnetfilter/fnetfilter.sh
@@ -7,7 +7,7 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-if [ -f /etc/debian_version ]; then
+if [[ -f /etc/debian_version ]]; then
        libdir=$(dirname "$(dpkg -L firejail | grep fcopy)")
        export PATH="$PATH:$libdir"
 fi
diff --git a/test/fs/fs.sh b/test/fs/fs.sh
index 36ff30934..697c86d3d 100755
--- a/test/fs/fs.sh
+++ b/test/fs/fs.sh
@@ -34,7 +34,7 @@ rm -f ~/_firejail_test_dir
 echo "TESTING: /sys/fs access (test/fs/sys_fs.exp)"
 ./sys_fs.exp
-if [ -c /dev/kmsg ]; then
+if [[ -c /dev/kmsg ]]; then
        echo "TESTING: kmsg access (test/fs/kmsg.exp)"
        ./kmsg.exp
 else
@@ -45,27 +45,27 @@ echo "TESTING: read/write /var/tmp (test/fs/fs_var_tmp.exp)"
 ./fs_var_tmp.exp
 rm -f /var/tmp/_firejail_test_file
-if [ "$(uname -m)" = "x86_64" ]; then
+if [[ $(uname -m) == "x86_64" ]]; then
-    fjconfig=/etc/firejail/firejail.config
+        fjconfig=/etc/firejail/firejail.config
-    printf 'private-lib yes\n' | sudo tee -a "$fjconfig" >/dev/null
+        printf 'private-lib yes\n' | sudo tee -a "$fjconfig" >/dev/null
-    echo "TESTING: private-lib (test/fs/private-lib.exp)"
+        echo "TESTING: private-lib (test/fs/private-lib.exp)"
-    ./private-lib.exp
+        ./private-lib.exp
-    printf '%s\n' "$(sed '/^private-lib yes$/d' "$fjconfig")" |
+        printf '%s\n' "$(sed '/^private-lib yes$/d' "$fjconfig")" |
-      sudo tee "$fjconfig" >/dev/null
+                sudo tee "$fjconfig" >/dev/null
 else
-    echo "TESTING SKIP: private-lib test implemented only for x86_64."
+        echo "TESTING SKIP: private-lib test implemented only for x86_64."
 fi
 echo "TESTING: read/write /var/lock (test/fs/fs_var_lock.exp)"
 ./fs_var_lock.exp
 rm -f /var/lock/_firejail_test_file
-if [ -w /dev/shm ]; then
+if [[ -w /dev/shm ]]; then
-    echo "TESTING: read/write /dev/shm (test/fs/fs_dev_shm.exp)"
+        echo "TESTING: read/write /dev/shm (test/fs/fs_dev_shm.exp)"
-    ./fs_dev_shm.exp
+        ./fs_dev_shm.exp
-    rm -f /dev/shm/_firejail_test_file
+        rm -f /dev/shm/_firejail_test_file
 else
-    echo "TESTING SKIP: /dev/shm not writable"
+        echo "TESTING SKIP: /dev/shm not writable"
 fi
 echo "TESTING: private (test/fs/private.exp)"
diff --git a/test/overlay/overlay.sh b/test/overlay/overlay.sh
index 490b180e1..a0519d1ad 100755
--- a/test/overlay/overlay.sh
+++ b/test/overlay/overlay.sh
@@ -22,8 +22,7 @@ rm -fr ~/_firejail_test_*
 ./fs-tmpfs.exp
 rm -fr ~/_firejail_test_*
-which firefox 2>/dev/null
+if command -v firefox
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: overlay firefox"
        ./firefox.exp
@@ -31,8 +30,7 @@ else
        echo "TESTING SKIP: firefox not found"
 fi
-which firefox 2>/dev/null
+if command -v firefox
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: overlay firefox x11 xorg"
        ./firefox.exp
@@ -40,26 +38,22 @@ else
        echo "TESTING SKIP: firefox not found"
 fi
 # check xpra/xephyr
-which xpra 2>/dev/null
+if command -v xpra
-if [ "$?" -eq 0 ];
 then
-        echo "xpra found"
+        echo "xpra found"
 else
-        echo "xpra not found"
+        echo "xpra not found"
-        which Xephyr 2>/dev/null
+        if command -v Xephyr
-        if [ "$?" -eq 0 ];
        then
-                echo "Xephyr found"
+                echo "Xephyr found"
        else
-                echo "TESTING SKIP: xpra and/or Xephyr not found"
+                echo "TESTING SKIP: xpra and/or Xephyr not found"
                exit
        fi
 fi
-which firefox 2>/dev/null
+if command -v firefox
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: overlay firefox x11"
        ./firefox-x11.exp
diff --git a/test/private-lib/private-lib.sh b/test/private-lib/private-lib.sh
index d168c2b1b..6b7d433c8 100755
--- a/test/private-lib/private-lib.sh
+++ b/test/private-lib/private-lib.sh
@@ -7,12 +7,10 @@ export MALLOC_CHECK_=3g
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-LIST="gnome-logs gnome-system-log gnome-nettool pavucontrol dig evince whois galculator gnome-calculator gedit leafpad mousepad pluma transmission-gtk xcalc atril gpicview eom eog"
+apps=(gnome-logs gnome-system-log gnome-nettool pavucontrol dig evince whois galculator gnome-calculator gedit leafpad mousepad pluma transmission-gtk xcalc atril gpicview eom eog)
+for app in "${apps[@]}"; do
-for app in $LIST; do
+        if command -v "$app"
-        which $app 2>/dev/null
-        if [ "$?" -eq 0 ];
        then
                echo "TESTING: private-lib $app"
                ./$app.exp
diff --git a/test/profiles/all-profiles.sh b/test/profiles/all-profiles.sh
index cc17b6b00..a550afe23 100755
--- a/test/profiles/all-profiles.sh
+++ b/test/profiles/all-profiles.sh
@@ -37,11 +37,11 @@ echo "TESTING: profile read-only links (test/profiles/profile_readonly.exp)"
 echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)"
 ./profile_noperm.exp
-PROFILES=`ls /etc/firejail/*.profile`
+profiles=( /etc/firejail/*.profile )
 echo "TESTING: default profiles installed in /etc"
-for PROFILE in $PROFILES
+for profile in "${profiles[@]}"
 do
-        echo "TESTING: $PROFILE"
+        echo "TESTING: $profile"
-        ./test-profile.exp $PROFILE
+        ./test-profile.exp "$profile"
 done
diff --git a/test/profiles/profiles.sh b/test/profiles/profiles.sh
index 8808bc9d2..90c88aaf5 100755
--- a/test/profiles/profiles.sh
+++ b/test/profiles/profiles.sh
@@ -37,11 +37,11 @@ echo "TESTING: profile read-only links (test/profiles/profile_readonly.exp)"
 echo "TESTING: profile no permissions (test/profiles/profile_noperm.exp)"
 ./profile_noperm.exp
-PROFILES=`ls /etc/firejail/transmission*.profile /etc/firejail/fi*.profile /etc/firejail/fl*.profile /etc/firejail/free*.profile`
+profiles=( /etc/firejail/transmission*.profile /etc/firejail/fi*.profile /etc/firejail/fl*.profile /etc/firejail/free*.profile )
 echo "TESTING: small number of default profiles installed in /etc"
-for PROFILE in $PROFILES
+for profile in "${profiles[@]}"
 do
-        echo "TESTING: $PROFILE"
+        echo "TESTING: $profile"
-        ./test-profile.exp $PROFILE
+        ./test-profile.exp "$profile"
 done
diff --git a/test/root/root.sh b/test/root/root.sh
index e8c0ec1ac..a39525b6e 100755
--- a/test/root/root.sh
+++ b/test/root/root.sh
@@ -11,8 +11,7 @@ export LC_ALL=C
 #********************************
 # firecfg
 #********************************
-which less 2>/dev/null
+if command -v less
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: firecfg (test/root/firecfg.exp)"
        mv /home/netblue/.local/share/applications /home/netblue/.local/share/applications-store
@@ -25,24 +24,24 @@ fi
 #********************************
 # servers
 #********************************
-if [ -f /etc/init.d/snmpd ]
+if [[ -f /etc/init.d/snmpd ]]
 then
        echo "TESTING: snmpd (test/root/snmpd.exp)"
        ./snmpd.exp
 else
-        echo "TESTING SKIP: snmpd  not found"
+        echo "TESTING SKIP: snmpd not found"
 fi
-if [ -f /etc/init.d/apache2 ]
+if [[ -f /etc/init.d/apache2 ]]
 then
        echo "TESTING: apache2 (test/root/apache2.exp)"
        ./apache2.exp
 else
-        echo "TESTING SKIP: apache2  not found"
+        echo "TESTING SKIP: apache2 not found"
 fi
-if [ -f /etc/init.d/isc-dhcp-server ]
+if [[ -f /etc/init.d/isc-dhcp-server ]]
 then
        echo "TESTING: isc dhcp server (test/root/isc-dhscp.exp)"
        ./isc-dhcp.exp
@@ -50,20 +49,20 @@ else
        echo "TESTING SKIP: isc dhcp server not found"
 fi
-if [ -f /etc/init.d/unbound ]
+if [[ -f /etc/init.d/unbound ]]
 then
        echo "TESTING: unbound (test/root/unbound.exp)"
        ./unbound.exp
 else
-        echo "TESTING SKIP: unbound  not found"
+        echo "TESTING SKIP: unbound not found"
 fi
-if [ -f /etc/init.d/nginx ]
+if [[ -f /etc/init.d/nginx ]]
 then
        echo "TESTING: nginx (test/root/nginx.exp)"
        ./nginx.exp
 else
-        echo "TESTING SKIP: nginx  not found"
+        echo "TESTING SKIP: nginx not found"
 fi
 #********************************
diff --git a/test/stress/stress.sh b/test/stress/stress.sh
index 675cb0614..2b4d8147d 100755
--- a/test/stress/stress.sh
+++ b/test/stress/stress.sh
@@ -14,7 +14,7 @@ mkdir ~/fj-stress-test
 rm blacklist.profile
 rm noblacklist.profile
 rm env.profile
-for i in `seq 1 100`;
+for i in {1..100}
 do
        echo "hello" > ~/fj-stress-test/testfile$i
        echo "blacklist ~/fj-stress-test/testfile$i" >> blacklist.profile
diff --git a/test/sysutils/sysutils.sh b/test/sysutils/sysutils.sh
index a903c7c6b..bfe723047 100755
--- a/test/sysutils/sysutils.sh
+++ b/test/sysutils/sysutils.sh
@@ -7,8 +7,7 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-which cpio 2>/dev/null
+if command -v cpio
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: cpio"
        ./cpio.exp
@@ -16,8 +15,7 @@ else
        echo "TESTING SKIP: cpio not found"
 fi
-#which strings
+#if command -v strings
-#if [ "$?" -eq 0 ];
 #then
 #       echo "TESTING: strings"
 #       ./strings.exp
@@ -25,8 +23,7 @@ fi
 #       echo "TESTING SKIP: strings not found"
 #fi
-which gzip 2>/dev/null
+if command -v gzip
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: gzip"
        ./gzip.exp
@@ -34,8 +31,7 @@ else
        echo "TESTING SKIP: gzip not found"
 fi
-which xzdec 2>/dev/null
+if command -v xzdec
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: xzdec"
        ./xzdec.exp
@@ -43,8 +39,7 @@ else
        echo "TESTING SKIP: xzdec not found"
 fi
-which xz 2>/dev/null
+if command -v xz
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: xz"
        ./xz.exp
@@ -52,8 +47,7 @@ else
        echo "TESTING SKIP: xz not found"
 fi
-which less 2>/dev/null
+if command -v less
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: less"
        ./less.exp
@@ -61,8 +55,7 @@ else
        echo "TESTING SKIP: less not found"
 fi
-which file 2>/dev/null
+if command -v file
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: file"
        ./file.exp
@@ -70,8 +63,7 @@ else
        echo "TESTING SKIP: file not found"
 fi
-which tar 2>/dev/null
+if command -v tar
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: tar"
        ./tar.exp
@@ -79,8 +71,7 @@ else
        echo "TESTING SKIP: tar not found"
 fi
-which ping 2>/dev/null
+if command -v ping
-if [ "$?" -eq 0 ];
 then
        echo "TESTING: ping"
        ./ping.exp
diff --git a/test/utils/catchsignal.sh b/test/utils/catchsignal.sh
index 117179143..cef00b2a5 100755
--- a/test/utils/catchsignal.sh
+++ b/test/utils/catchsignal.sh
@@ -4,20 +4,20 @@
 # License GPL v2
 _term() {
-  echo "Caught Signal"
+        echo "Caught Signal"
-  echo 1
+        echo 1
-  sleep 1
+        sleep 1
-  echo 2
+        echo 2
-  sleep 1
+        sleep 1
-  echo 3
+        echo 3
-  sleep 1
+        sleep 1
-  echo 4
+        echo 4
-  sleep 1
+        sleep 1
-  echo 5
+        echo 5
-  sleep 1
+        sleep 1
-  kill $pid
+        kill $pid
-  exit
+        exit
 }
 trap _term SIGTERM
diff --git a/test/utils/catchsignal2.sh b/test/utils/catchsignal2.sh
index 1bd7852cd..21f299430 100755
--- a/test/utils/catchsignal2.sh
+++ b/test/utils/catchsignal2.sh
@@ -4,42 +4,42 @@
 # License GPL v2
 _term() {
-  echo "Caught Signal"
+        echo "Caught Signal"
-  echo 1
+        echo 1
-  sleep 1
+        sleep 1
-  echo 2
+        echo 2
-  sleep 1
+        sleep 1
-  echo 3
+        echo 3
-  sleep 1
+        sleep 1
-  echo 4
+        echo 4
-  sleep 1
+        sleep 1
-  echo 5
+        echo 5
-  sleep 1
+        sleep 1
-  echo 10
+        echo 10
-  sleep 1
+        sleep 1
-  echo 20
+        echo 20
-  sleep 1
+        sleep 1
-  echo 30
+        echo 30
-  sleep 1
+        sleep 1
-  echo 40
+        echo 40
-  sleep 1
+        sleep 1
-  echo 50
+        echo 50
-  sleep 1
+        sleep 1
-  echo 100
+        echo 100
-  sleep 1
+        sleep 1
-  echo 200
+        echo 200
-  sleep 1
+        sleep 1
-  echo 300
+        echo 300
-  sleep 1
+        sleep 1
-  echo 400
+        echo 400
-  sleep 1
+        sleep 1
-  echo 500
+        echo 500
-  sleep 1
+        sleep 1
-  kill $pid
+        kill $pid
-  exit
+        exit
 }
 trap _term SIGTERM
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index 102c8df17..647cbfb34 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -7,7 +7,7 @@ export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 export LC_ALL=C
-if [ -f /etc/debian_version ]; then
+if [[ -f /etc/debian_version ]]; then
        libdir=$(dirname "$(dpkg -L firejail | grep fcopy)")
        export PATH="$PATH:$libdir"
 fi
@@ -33,13 +33,12 @@ echo "TESTING: version (test/utils/version.exp)"
 echo "TESTING: help (test/utils/help.exp)"
 ./help.exp
-which man 2>/dev/null
+if command -v man
-if [ "$?" -eq 0 ];
 then
-        echo "TESTING: man (test/utils/man.exp)"
+        echo "TESTING: man (test/utils/man.exp)"
-        ./man.exp
+        ./man.exp
 else
-        echo "TESTING SKIP: man not found"
+        echo "TESTING SKIP: man not found"
 fi
 echo "TESTING: list (test/utils/list.exp)"
@@ -48,12 +47,12 @@ echo "TESTING: list (test/utils/list.exp)"
 echo "TESTING: tree (test/utils/tree.exp)"
 ./tree.exp
-if [ $(grep -c ^processor /proc/cpuinfo) -gt 1 ];
+if [[ $(grep -c ^processor /proc/cpuinfo) -gt 1 ]]
 then
-        echo "TESTING: cpu.print (test/utils/cpu-print.exp)"
+        echo "TESTING: cpu.print (test/utils/cpu-print.exp)"
-        ./cpu-print.exp
+        ./cpu-print.exp
 else
-        echo "TESTING SKIP: cpu.print, not enough CPUs"
+        echo "TESTING SKIP: cpu.print, not enough CPUs"
 fi
 echo "TESTING: fs.print (test/utils/fs-print.exp)"