diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fd84c33..9d13e0e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ Release history for s390-tools (MIT version)
   Add new tools / libraries:
 
   Changes of existing tools:
+  - add support for architectures other than s390x for `genprotimg`
 
   Bug Fixes:
 
diff --git a/Makefile b/Makefile
index 02bf0c02..85baeafb 100644
--- a/Makefile
+++ b/Makefile
@@ -18,8 +18,7 @@ TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
 	   genprotimg lsstp hsci hsavmcore chreipl-fcp-mpath ap_tools pvattest
 else
 BASELIB_DIRS =
-LIB_DIRS = libpv
-TOOL_DIRS = pvattest
+LIB_DIRS = genprotimg libpv
 endif
 
 SUB_DIRS = $(BASELIB_DIRS) $(LIB_DIRS) $(TOOL_DIRS)