diff --git a/packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0 b/packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0
index 097f3fde..53ef2427 100644
--- a/packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0
+++ b/packages/dev-util/universal-ctags/universal-ctags-scm.exheres-0
@@ -2,38 +2,41 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require alternatives github [ user='universal-ctags' pn='ctags' ]
-require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.16 ] ]
 
 SUMMARY="Universal ctags"
 
 LICENCES="GPL-2"
 SLOT="0"
 PLATFORMS="~amd64 ~x86"
-MYOPTIONS="json xml yaml"
+MYOPTIONS="
+    json [[ description = [ Add support for JSON format as output ] ]]
+    seccomp [[ description = [ Add support for libseccomp library ] ]]
+    xml
+    yaml [[ description = [ Add support for YAML format as output ] ]]
+"
 
 DEPENDENCIES="
     build+run:
         json? ( dev-libs/jansson )
-        xml? ( dev-libs/libxml2:2.0 )
+        seccomp? ( sys-libs/libseccomp )
+        xml? ( dev-libs/libxml2:2.0[>=2.7.7] )
         yaml? ( dev-libs/libyaml )
     build:
         dev-python/docutils
         virtual/pkg-config
 "
 
+# input-encoding-option and output-encoding-option fail as of 20-03-2020
+RESTRICT="test"
+
 DEFAULT_SRC_CONFIGURE_OPTION_ENABLES=(
     'json'
+    'seccomp'
     'xml'
     'yaml'
 )
 
-src_prepare() {
-    # autogen.sh usually runs this
-    edo ./misc/dist-test-cases > makefiles/test-cases.mak
-
-    autotools_src_prepare
-}
-
 src_install() {
     default