diff --git a/pkg.in/lists/tagged/base+bench b/pkg.in/lists/tagged/base+bench
index 29fa284b..a5503e9a 100644
--- a/pkg.in/lists/tagged/base+bench
+++ b/pkg.in/lists/tagged/base+bench
@@ -1,12 +1,14 @@
 # overall
 dhrystone
-lmbench
-procbench
-sysbench
+lmbench@X86
+procbench@X86
+# requires luajit
+sysbench@X86
+sysbench@aarch64
 whetstone
 
 # RAM
-bandwidth
+bandwidth@X86
 stream-mem
 
 # disk subsystem
@@ -21,9 +23,9 @@ ffsb
 hammerhead
 #postal
 siege
-t50
-wrk
+t50@X86
+wrk@X86
 
 # stresstesting/burn-in
-cpuburn
+cpuburn@X86
 stress
diff --git a/pkg.in/lists/tagged/rescue+extra b/pkg.in/lists/tagged/rescue+extra
index a8369e87..f8c27278 100644
--- a/pkg.in/lists/tagged/rescue+extra
+++ b/pkg.in/lists/tagged/rescue+extra
@@ -1,6 +1,6 @@
 # CPU utils
-cpuburn
-x86info
+cpuburn@X86
+x86info@X86
 
 # Disk utils
 aff-tools
@@ -9,7 +9,8 @@ bonnie++
 cfdisk
 dcfldd
 dc3dd
-dd_rescue
+dd_rescue@X86
+dd_rescue@aarch64
 ddrescue
 ddrutility
 disktype
@@ -60,7 +61,7 @@ time
 openssl
 
 # Applications/Editors
-biew
+biew@X86
 hexedit
 lde
 nano
@@ -109,7 +110,7 @@ fuse-ciopfs
 fuse-compFUSEd
 fuse-exfat
 fuse-funion
-fuse-zfs
+fuse-zfs@X86
 hfsprogs
 ifuse
 libevt-tools
@@ -127,7 +128,7 @@ vmfs-tools
 # Filesystem recovery/cleanup
 extundelete
 foremost
-ftimes
+ftimes@X86
 fuse-convmvfs
 magicrescue
 photorec
diff --git a/pkg.in/lists/tagged/security+extra b/pkg.in/lists/tagged/security+extra
index c785af97..df9e6834 100644
--- a/pkg.in/lists/tagged/security+extra
+++ b/pkg.in/lists/tagged/security+extra
@@ -1,8 +1,8 @@
 apg
 #chkrootkit
-john
+john@X86
 hashalot
-hashcat
+hashcat@X86
 #logcheck
 md5deep
 ssdeep
@@ -14,7 +14,7 @@ osec-cronjob
 osec-mailreport
 
 # hardware reliability
-mcelog
+mcelog@X86
 
 # networking
 chaosreader