diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69033bc2..42f3d8a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ Release history for s390-tools (MIT version)
     `CC_FOR_BUILD`. This is useful for cross compiling, and this naming
     convention is very similar to the Meson convention (see
     https://mesonbuild.com/Reference-tables.html#environment-variables-per-machine).
+  - add support for architectures other than s390x for `pvattest`
 
   Bug Fixes:
 
diff --git a/Makefile b/Makefile
index ab42c268..02bf0c02 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,7 @@ include common.mak
 # LIBS: Libraries that can have a dependency to base libraries
 # TOOLS: Tools that can have a dependency to base libraries or libraries
 #
+ifeq ($(HOST_ARCH),s390x)
 BASELIB_DIRS = libutil libseckey
 LIB_DIRS = libvtoc libzds libdasd libccw libvmcp libekmfweb \
 	   libkmipclient libcpumf libap libpv
@@ -15,6 +16,11 @@ TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
 	   ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \
 	   systemd hmcdrvfs cpacfstats zdev dump2tar zkey netboot etc zpcictl \
 	   genprotimg lsstp hsci hsavmcore chreipl-fcp-mpath ap_tools pvattest
+else
+BASELIB_DIRS =
+LIB_DIRS = libpv
+TOOL_DIRS = pvattest
+endif
 
 SUB_DIRS = $(BASELIB_DIRS) $(LIB_DIRS) $(TOOL_DIRS)