diff -Nru libseccomp-2.3.1/debian/changelog libseccomp-2.3.1/debian/changelog
--- libseccomp-2.3.1/debian/changelog	2016-06-08 09:36:46.000000000 +0000
+++ libseccomp-2.3.1/debian/changelog	2016-06-10 17:15:52.000000000 +0000
@@ -1,3 +1,11 @@
+libseccomp (2.3.1-2ubuntu2) yakkety; urgency=medium
+
+  * Fix autopkgtest, seccomp resolution now returns negative syscall
+    numbers for multiplexed calls, thus direct access symbols roundtrip is
+    via negative numbers. E.g. 373 -> shutdown -> -113 -> shutdown.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 10 Jun 2016 18:14:04 +0100
+
 libseccomp (2.3.1-2ubuntu1) yakkety; urgency=medium
 
   * Merge with Debian unstable LP: #1580558. Remaining Ubuntu changes:
diff -Nru libseccomp-2.3.1/debian/tests/test-scmp_sys_resolver libseccomp-2.3.1/debian/tests/test-scmp_sys_resolver
--- libseccomp-2.3.1/debian/tests/test-scmp_sys_resolver	2016-06-08 09:33:28.000000000 +0000
+++ libseccomp-2.3.1/debian/tests/test-scmp_sys_resolver	2016-06-10 17:13:23.000000000 +0000
@@ -18,20 +18,25 @@
     high=$2
     echo "Testing syscalls $low-$high"
     for i in `seq $low $high` ; do
-        res=`scmp_sys_resolver $i` || {
+        res=`scmp_sys_resolver -- $i` || {
             echo "'$i' failed"
             failed="yes"
         }
         if [ "$res" = "UNKNOWN" ]; then
             continue
         fi
-        res2=`scmp_sys_resolver $res` || {
+        res2=`scmp_sys_resolver -- $res` || {
             echo "'$res' failed"
             failed="yes"
         }
         if [ "$res2" != "$i" ]; then
-            echo "FAIL: $i ($res) != $res ($res2)"
-            failed="yes"
+	    res3=`scmp_sys_resolver -- $res2`
+	    if [ "$res" = "$res3" ]; then
+		echo "pass: $i ($res) == $res ($res2 which is $res3)"
+	    else
+		echo "FAIL: $i ($res) != $res ($res2)"
+		failed="yes"
+	    fi
         else
             echo "pass: $i ($res) == $res ($res2)"
         fi