diff --git a/app/Makefile b/app/Makefile
index c9926c2a..18f94581 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2019/08/15 17:01:12 matthieu Exp $
+# $OpenBSD: Makefile,v 1.39 2024/06/04 08:13:08 matthieu Exp $
 .include <bsd.xconf.mk>
 
 SUBDIR= bdftopcf mkfontscale \
@@ -22,7 +22,7 @@ SUBDIR +=   xdriinfo glxgears glxinfo
 .endif
 
 # extras
-SUBDIR += cwm fvwm ssh-askpass video xterm xidle xlockmore \
+SUBDIR += cwm fvwm ssh-askpass sxpm video xterm xidle xlockmore \
 	  xtsscale xvctl
 
 .include <bsd.subdir.mk>
diff --git a/app/sxpm/Makefile b/app/sxpm/Makefile
new file mode 100644
index 00000000..ccc903f5
--- /dev/null
+++ b/app/sxpm/Makefile
@@ -0,0 +1,19 @@
+# $OpenBSD: Makefile,v 1.1 2024/06/04 05:42:22 matthieu Exp $
+
+.include <bsd.xconf.mk>
+
+PROG=sxpm
+NOMAN=
+
+CPPFLAGS+= -I${X11BASE}/include
+
+LDADD+= -L${X11BASE}/lib -lXt -lX11 -lXext -lXpm
+
+MANDIR= ${X11BASE}/man/man
+
+obj: _xenocara_obj
+
+.PATH.c: ${.CURDIR}/../../lib/libXpm/sxpm
+
+.include <bsd.prog.mk>
+.include <bsd.xorg.mk>
diff --git a/lib/libXpm/Makefile.am b/lib/libXpm/Makefile.am
index 235ee1fa..708810ad 100644
--- a/lib/libXpm/Makefile.am
+++ b/lib/libXpm/Makefile.am
@@ -1,7 +1,7 @@
 # Daniel Stone disowns all copyright on this file; no warranty is given as to its
 # suitability or otherwise.
 
-SUBDIRS = doc include man src sxpm cxpm test
+SUBDIRS = doc include man src cxpm test
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/lib/libXpm/Makefile.in b/lib/libXpm/Makefile.in
index 652c8178..bab6743c 100644
--- a/lib/libXpm/Makefile.in
+++ b/lib/libXpm/Makefile.in
@@ -327,7 +327,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = doc include man src sxpm cxpm test
+SUBDIRS = doc include man src cxpm test
 ACLOCAL_AMFLAGS = -I m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xpm.pc
diff --git a/lib/xcb-util-image/Makefile.am b/lib/xcb-util-image/Makefile.am
index 23956fdb..0f4c3c9a 100644
--- a/lib/xcb-util-image/Makefile.am
+++ b/lib/xcb-util-image/Makefile.am
@@ -12,5 +12,5 @@ ChangeLog:
 
 dist-hook: ChangeLog INSTALL
 
-SUBDIRS = image test
+SUBDIRS = image
 EXTRA_DIST = autogen.sh README.md
diff --git a/lib/xcb-util-image/Makefile.in b/lib/xcb-util-image/Makefile.in
index d08dbf2f..a752b1de 100644
--- a/lib/xcb-util-image/Makefile.in
+++ b/lib/xcb-util-image/Makefile.in
@@ -298,7 +298,7 @@ top_srcdir = @top_srcdir@
 xcbincludedir = @xcbincludedir@
 ACLOCAL_AMFLAGS = -I m4
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-SUBDIRS = image test
+SUBDIRS = image
 EXTRA_DIST = autogen.sh README.md
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive