2 files changed, 11 insertions, 5 deletions
diff --git a/util/manibuilder/Makefile b/util/manibuilder/Makefile
index 01165e909..c0d1eff16 100644
--- a/util/manibuilder/Makefile
+++ b/util/manibuilder/Makefile
@@ -15,14 +15,20 @@ ident = $(subst :,_,$(subst \:,_,$(1)))
 PKGSRC_MIRROR = http://cdn.netbsd.org/
 NETBSD_MIRROR = http://ftp.de.netbsd.org/
 
+anita\:8.2-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/8.2/All
+anita\:8.2-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-8.2/amd64/
+anita\:8.2-amd64-build: QEMU_DISK_SIZE=2G
+anita\:8.2-amd64-build: QEMU_MEM_SIZE=256M
+
 anita\:7.1-amd64-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/amd64/7.1/All
 anita\:7.1-amd64-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/amd64/
+anita\:7.1-amd64-build: QEMU_DISK_SIZE=1G
+anita\:7.1-amd64-build: QEMU_MEM_SIZE=128M
 
 anita\:7.1-i386-build: PKGSRC_PATH=pub/pkgsrc/packages/NetBSD/i386/7.1/All
 anita\:7.1-i386-build: NETBSD_IMAGE=pub/NetBSD/NetBSD-7.1/i386/
-
-$(addsuffix -build,$(ANITA_TAGS)): QEMU_DISK_SIZE=1G
-$(addsuffix -build,$(ANITA_TAGS)): QEMU_MEM_SIZE=128M
+anita\:7.1-i386-build: QEMU_DISK_SIZE=1G
+anita\:7.1-i386-build: QEMU_MEM_SIZE=128M
 
 $(addsuffix -build,$(ANITA_TAGS)): %-build: Dockerfile.anita anita-wrapper.sh
 	$(QUIET_SETUP)docker build . -f $< -t mani/$* \
diff --git a/util/manibuilder/Makefile.targets b/util/manibuilder/Makefile.targets
index a5b2f4244..0fe902683 100644
--- a/util/manibuilder/Makefile.targets
+++ b/util/manibuilder/Makefile.targets
@@ -1,4 +1,4 @@
-ANITA_TAGS := anita\:7.1-amd64 anita\:7.1-i386
+ANITA_TAGS := anita\:8.2-amd64 anita\:7.1-amd64 anita\:7.1-i386
 
 MULTIARCH_TAGS := \
 	centos\:7.6-armhfp-clean centos\:7.6-amd64-clean \
@@ -43,7 +43,7 @@ NATIVE_TAGS := $(call arch_filter,$(call machine_map,$(shell uname -m)))
 
 # rather arbitrary selection of images that seem to work (focus on amd64)
 DEFAULT_TAGS := \
-	anita\:7.1-amd64 \
+	anita\:8.2-amd64 \
 	djgpp\:6.1.0 \
 	fedora\:30-aarch64 \
 	fedora\:25-x86_64 \