Index: s390-tools-1.30.0/dasdfmt/Makefile
===================================================================
--- s390-tools-1.30.0.orig/dasdfmt/Makefile
+++ s390-tools-1.30.0/dasdfmt/Makefile
@@ -9,9 +9,9 @@ dasdfmt.o: dasdfmt.h ../include/zt_commo
 dasdfmt: dasdfmt.o $(rootdir)/libvtoc/vtoc.o $(rootdir)/libutil/util_proc.o
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 dasdfmt $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdfmt.8  $(MANDIR)/man8 
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) dasdfmt $(BINDIR)
+	$(INSTALL_DATA) dasdfmt.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ dasdfmt core
Index: s390-tools-1.30.0/dasdinfo/Makefile
===================================================================
--- s390-tools-1.30.0.orig/dasdinfo/Makefile
+++ s390-tools-1.30.0/dasdinfo/Makefile
@@ -7,9 +7,9 @@ all: dasdinfo
 dasdinfo: dasdinfo.o ../libu2s/u2s.o
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 dasdinfo $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdinfo.8  $(MANDIR)/man8
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) dasdinfo $(BINDIR)
+	$(INSTALL_DATA) dasdinfo.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ dasdinfo core
Index: s390-tools-1.30.0/dasdview/Makefile
===================================================================
--- s390-tools-1.30.0.orig/dasdview/Makefile
+++ s390-tools-1.30.0/dasdview/Makefile
@@ -11,9 +11,9 @@ dasdview.o: dasdview.h ../include/zt_com
 dasdview: dasdview.o ../libu2s/u2s.o
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 dasdview $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 dasdview.8  $(MANDIR)/man8 
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) dasdview $(BINDIR)
+	$(INSTALL_DATA) dasdview.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ dasdview core
Index: s390-tools-1.30.0/fdasd/Makefile
===================================================================
--- s390-tools-1.30.0.orig/fdasd/Makefile
+++ s390-tools-1.30.0/fdasd/Makefile
@@ -9,9 +9,9 @@ fdasd.o: fdasd.h ../include/zt_common.h
 fdasd: fdasd.o $(rootdir)/libvtoc/vtoc.o
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 fdasd $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 fdasd.8  $(MANDIR)/man8 
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) fdasd $(BINDIR)
+	$(INSTALL_DATA) fdasd.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ fdasd core
Index: s390-tools-1.30.0/ip_watcher/Makefile
===================================================================
--- s390-tools-1.30.0.orig/ip_watcher/Makefile
+++ s390-tools-1.30.0/ip_watcher/Makefile
@@ -11,9 +11,8 @@ clean:
 install: ip_watcher.pl xcec-bridge start_hsnc.sh
 	$(SED) -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
 	< start_hsnc.sh >$(USRSBINDIR)/start_hsnc.sh; \
-	chown $(OWNER).$(GROUP) $(USRSBINDIR)/start_hsnc.sh; \
-	chmod 755 $(USRSBINDIR)/start_hsnc.sh; \
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ip_watcher.pl $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 xcec-bridge $(USRSBINDIR)
+	chmod 755 $(USRSBINDIR)/start_hsnc.sh
+	$(INSTALL) ip_watcher.pl $(USRSBINDIR)
+	$(INSTALL) xcec-bridge $(USRSBINDIR)
 
 .PHONY: all install clean
Index: s390-tools-1.30.0/mon_tools/Makefile
===================================================================
--- s390-tools-1.30.0.orig/mon_tools/Makefile
+++ s390-tools-1.30.0/mon_tools/Makefile
@@ -11,10 +11,10 @@ mon_procd.o: mon_procd.h
 mon_procd: mon_procd.o
 
 install: all
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 mon_fsstatd $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 mon_fsstatd.8  $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 mon_procd $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 mon_procd.8 $(MANDIR)/man8
+	$(INSTALL) mon_fsstatd $(USRSBINDIR)
+	$(INSTALL_DATA) mon_fsstatd.8 $(MANDIR)/man8
+	$(INSTALL) mon_procd $(USRSBINDIR)
+	$(INSTALL_DATA) mon_procd.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ mon_fsstatd mon_procd core
Index: s390-tools-1.30.0/qetharp/Makefile
===================================================================
--- s390-tools-1.30.0.orig/qetharp/Makefile
+++ s390-tools-1.30.0/qetharp/Makefile
@@ -9,9 +9,9 @@ qetharp.o: qeth26.h qetharp.h
 qetharp: qetharp.o
 
 install: all
-	$(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR)
-	$(INSTALL) -m 755 qetharp $(BINDIR)
-	$(INSTALL) -m 644 qetharp.8 $(MANDIR)/man8 
+	$(INSTALL) -d $(MANDIR)/man8 $(BINDIR)
+	$(INSTALL) qetharp $(BINDIR)
+	$(INSTALL_DATA) qetharp.8 $(MANDIR)/man8
 
 clean:
 	rm -f qetharp *.o *~ core
Index: s390-tools-1.30.0/tape390/Makefile
===================================================================
--- s390-tools-1.30.0.orig/tape390/Makefile
+++ s390-tools-1.30.0/tape390/Makefile
@@ -13,13 +13,11 @@ tape390_crypt.o: tape390_common.h
 tape390_crypt: tape390_crypt.o tape390_common.o
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 tape390_display $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tape390_display.8 \
-		$(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 tape390_crypt $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tape390_crypt.8 \
-		$(MANDIR)/man8
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) tape390_display $(BINDIR)
+	$(INSTALL_DATA) tape390_display.8 $(MANDIR)/man8
+	$(INSTALL) tape390_crypt $(BINDIR)
+	$(INSTALL_DATA) tape390_crypt.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ tape390_display tape390_crypt core
Index: s390-tools-1.30.0/vmconvert/Makefile
===================================================================
--- s390-tools-1.30.0.orig/vmconvert/Makefile
+++ s390-tools-1.30.0/vmconvert/Makefile
@@ -15,9 +15,9 @@ vmconvert: main.o lkcd_dump.o vm_dump.o
 	$(LINKXX) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 install: all
-	$(INSTALL) -d -m 755 $(USRBINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 vmconvert $(USRBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmconvert.8  $(MANDIR)/man8
+	$(INSTALL) -d $(USRBINDIR) $(MANDIR)/man8
+	$(INSTALL) vmconvert $(USRBINDIR)
+	$(INSTALL_DATA) vmconvert.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ vmconvert core
Index: s390-tools-1.30.0/vmcp/Makefile
===================================================================
--- s390-tools-1.30.0.orig/vmcp/Makefile
+++ s390-tools-1.30.0/vmcp/Makefile
@@ -9,9 +9,9 @@ vmcp.o: vmcp.c vmcp.h ../include/zt_comm
 vmcp: vmcp.o
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 vmcp $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmcp.8 $(MANDIR)/man8 
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) vmcp $(BINDIR)
+	$(INSTALL_DATA) vmcp.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ vmcp core
Index: s390-tools-1.30.0/vmur/Makefile
===================================================================
--- s390-tools-1.30.0.orig/vmur/Makefile
+++ s390-tools-1.30.0/vmur/Makefile
@@ -22,10 +22,9 @@ vmur: $(OBJS)
 	$(LINKXX) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 install: all
-	$(INSTALL) -d -m 755 $(USRSBINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 vmur $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 vmur.8 \
-		$(MANDIR)/man8
+	$(INSTALL) -d $(USRSBINDIR) $(MANDIR)/man8
+	$(INSTALL) vmur $(USRSBINDIR)
+	$(INSTALL_DATA) vmur.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ vmur
Index: s390-tools-1.30.0/zipl/src/Makefile
===================================================================
--- s390-tools-1.30.0.orig/zipl/src/Makefile
+++ s390-tools-1.30.0/zipl/src/Makefile
@@ -28,9 +28,9 @@ chreipl_helper.%: zipl_helper.%
 	ln -s $< $@
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR)
+	$(INSTALL) -d $(BINDIR)
 	$(INSTALL) -c zipl $(BINDIR)
-	$(INSTALL) -m 755 $(zipl_helpers) $(chreipl_helpers) $(TOOLS_LIBDIR)
+	$(INSTALL) $(zipl_helpers) $(chreipl_helpers) $(TOOLS_LIBDIR)
 	$(CP) --no-dereference $(chreipl_helpers) $(TOOLS_LIBDIR)
 
 clean:
Index: s390-tools-1.30.0/common.mak
===================================================================
--- s390-tools-1.30.0.orig/common.mak
+++ s390-tools-1.30.0/common.mak
@@ -38,6 +38,7 @@ SED             = $(call echocmd,"  SED
 SKIP            = echo           "  SKIP    $(call reldir) due to"
 
 INSTALL         = install
+INSTALL_DATA    = ${INSTALL} -m 644
 CP              = cp
 ifneq ("${V}","1")
 	MAKEFLAGS += --quiet
@@ -152,12 +153,9 @@ $(rootdir)/zipl/boot/data.o:
 	make -C $(rootdir)/zipl/boot/ data.o
 
 install_dirs:
-	for dir in $(INSTDIRS); do \
-		test -d $$dir || $(INSTALL) -g $(GROUP) -o $(OWNER) -d $$dir; \
-	done
+	$(INSTALL) -d $(INSTDIRS)
 	for i in 1 2 3 4 5 6 7 8; do \
-		test -d $(MANDIR)/man$$i || $(INSTALL) -g $(GROUP) -o $(OWNER) \
-		-d $(MANDIR)/man$$i; \
+		$(INSTALL) -d $(MANDIR)/man$$i; \
 	done
 
 install_echo:
Index: s390-tools-1.30.0/man/Makefile
===================================================================
--- s390-tools-1.30.0.orig/man/Makefile
+++ s390-tools-1.30.0/man/Makefile
@@ -9,7 +9,7 @@ clean:
 install: $(MANS)
 	for man in $(MANS); do \
 	  msection=`echo $$man |sed 's/.*\.\([1-8]\)$$/man\1/'` ; \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 -D $$man $(MANDIR)/$$msection/$$man ; \
+	  $(INSTALL_DATA) -D $$man $(MANDIR)/$$msection/$$man ; \
 	done
 
 pdf: $(MANS)
Index: s390-tools-1.30.0/osasnmpd/Makefile
===================================================================
--- s390-tools-1.30.0.orig/osasnmpd/Makefile
+++ s390-tools-1.30.0/osasnmpd/Makefile
@@ -6,9 +6,9 @@ all: osasnmpd
 osasnmpd: $(OBJS)
 
 install: all
-	$(INSTALL) -d -m 755 $(USRSBINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 osasnmpd $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 osasnmpd.8  $(MANDIR)/man8
+	$(INSTALL) -d $(USRSBINDIR) $(MANDIR)/man8
+	$(INSTALL) osasnmpd $(USRSBINDIR)
+	$(INSTALL_DATA) osasnmpd.8 $(MANDIR)/man8
 
 clean:
 	rm -f $(OBJS) osasnmpd core
Index: s390-tools-1.30.0/qethconf/Makefile
===================================================================
--- s390-tools-1.30.0.orig/qethconf/Makefile
+++ s390-tools-1.30.0/qethconf/Makefile
@@ -4,11 +4,10 @@ all:
 
 install: qethconf
 	$(SED) -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
-	< qethconf >$(BINDIR)/qethconf; \
-	chown $(OWNER).$(GROUP) $(BINDIR)/qethconf; \
-	chmod 755 $(BINDIR)/qethconf; \
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 qethconf.8  $(MANDIR)/man8
+	< qethconf >$(BINDIR)/qethconf
+	chmod 755 $(BINDIR)/qethconf
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man8
+	$(INSTALL) qethconf.8  $(MANDIR)/man8
 
 clean:
 
Index: s390-tools-1.30.0/scripts/Makefile
===================================================================
--- s390-tools-1.30.0.orig/scripts/Makefile
+++ s390-tools-1.30.0/scripts/Makefile
@@ -6,19 +6,18 @@ MAN_PAGES = dbginfo.sh.1 zfcpdbf.1
 all:
 
 install:
-	$(INSTALL) -d -m 755 $(BINDIR) $(MANDIR)/man1
+	$(INSTALL) -d $(BINDIR) $(MANDIR)/man1
 	@for i in $(SCRIPTS); \
 	do \
 		cat $$i | \
 		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
 		>$(BINDIR)/$$i; \
-		chown $(OWNER):$(GROUP) $(BINDIR)/$$i; \
 		chmod 755 $(BINDIR)/$$i; \
 	done
 	
 	@for i in $(MAN_PAGES); \
 	do \
-		$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $$i \
+		$(INSTALL_DATA) $$i \
 		$(MANDIR)/man1; \
 	done
 
Index: s390-tools-1.30.0/zconf/Makefile
===================================================================
--- s390-tools-1.30.0.orig/zconf/Makefile
+++ s390-tools-1.30.0/zconf/Makefile
@@ -15,16 +15,14 @@ all:
 clean:
 
 install:	install-scripts install-manpages install-usrsbin-scripts
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 lsznet.raw $(TOOLS_LIBDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 znetcontrolunits \
-		$(TOOLS_LIBDIR)
+	$(INSTALL) lsznet.raw $(TOOLS_LIBDIR)
+	$(INSTALL) znetcontrolunits $(TOOLS_LIBDIR)
 
 install-scripts:	$(SCRIPTS)
 	@for i in $^; do \
 		cat $$i | \
 		sed -e 's+%S390_TOOLS_VERSION%+$(S390_TOOLS_RELEASE)+' \
 		>$(BINDIR)/$$i; \
-		chown $(OWNER).$(GROUP) $(BINDIR)/$$i; \
 		chmod 755 $(BINDIR)/$$i; \
 	done
 
@@ -38,15 +36,9 @@ install-usrsbin-scripts:	$(USRSBIN_SCRIP
 	done
 
 install-manpages:	$(MANPAGES)
-	@if [ ! -d $(MANDIR) ]; then \
-		mkdir -p $(MANDIR)/man8; \
-		chown $(OWNER).$(GROUP) $(MANDIR); \
-		chown $(OWNER).$(GROUP) $(MANDIR)/man8; \
-		chmod 755 $(MANDIR); \
-		chmod 755 $(MANDIR)/man8; \
-	fi; \
+	$(INSTALL) -d $(MANDIR)/man8
 	for i in $^; do \
-		install -o $(OWNER) -g $(GROUP) -m 644 $$i $(MANDIR)/man8; \
+		$(INSTALL_DATA) $$i $(MANDIR)/man8; \
 	done
 
 .PHONY: all install clean install-scripts install-manpages install-usrsbin-scripts
Index: s390-tools-1.30.0/tunedasd/src/Makefile
===================================================================
--- s390-tools-1.30.0.orig/tunedasd/src/Makefile
+++ s390-tools-1.30.0/tunedasd/src/Makefile
@@ -11,8 +11,8 @@ $(objects): $(includes)
 tunedasd: $(objects)
 
 install: all
-	$(INSTALL) -d -m 755 $(BINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 tunedasd $(BINDIR)
+	$(INSTALL) -d $(BINDIR)
+	$(INSTALL) tunedasd $(BINDIR)
 
 clean:
 	rm -f *.o tunedasd
Index: s390-tools-1.30.0/tunedasd/man/Makefile
===================================================================
--- s390-tools-1.30.0.orig/tunedasd/man/Makefile
+++ s390-tools-1.30.0/tunedasd/man/Makefile
@@ -4,8 +4,8 @@ include ../../common.mak
 all:
 
 install:
-	$(INSTALL) -d -m 755 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 tunedasd.8 $(MANDIR)/man8
+	$(INSTALL) -d $(MANDIR)/man8
+	$(INSTALL_DATA) tunedasd.8 $(MANDIR)/man8
 
 clean:
 
Index: s390-tools-1.30.0/cpuplugd/Makefile
===================================================================
--- s390-tools-1.30.0.orig/cpuplugd/Makefile
+++ s390-tools-1.30.0/cpuplugd/Makefile
@@ -16,9 +16,9 @@ clean:
 	rm -f cpuplugd $(OBJECTS)
 
 install: all
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 cpuplugd $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/cpuplugd.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/cpuplugd.conf.5 \
-		$(MANDIR)/man5
+	$(INSTALL) -d $(USRSBINDIR) $(MANDIR)/man8 $(MANDIR)/man5
+	$(INSTALL) cpuplugd $(USRSBINDIR)
+	$(INSTALL_DATA) man/cpuplugd.8 $(MANDIR)/man8
+	$(INSTALL_DATA) man/cpuplugd.conf.5 $(MANDIR)/man5
 
 .PHONY: all install clean
Index: s390-tools-1.30.0/zipl/man/Makefile
===================================================================
--- s390-tools-1.30.0.orig/zipl/man/Makefile
+++ s390-tools-1.30.0/zipl/man/Makefile
@@ -4,9 +4,9 @@ include ../../common.mak
 all:
 
 install:
-	$(INSTALL) -d -m 755 $(MANDIR)/man5
-	$(INSTALL) -d -m 755 $(MANDIR)/man8
-	$(INSTALL) -m 644 -c zipl.8 $(MANDIR)/man8
-	$(INSTALL) -m 644 -c zipl.conf.5 $(MANDIR)/man5
+	$(INSTALL) -d $(MANDIR)/man5
+	$(INSTALL) -d $(MANDIR)/man8
+	$(INSTALL_DATA) -c zipl.8 $(MANDIR)/man8
+	$(INSTALL_DATA) -c zipl.conf.5 $(MANDIR)/man5
 
 clean:
Index: s390-tools-1.30.0/ipl_tools/Makefile
===================================================================
--- s390-tools-1.30.0.orig/ipl_tools/Makefile
+++ s390-tools-1.30.0/ipl_tools/Makefile
@@ -24,14 +24,14 @@ clean:
 	rm -f *.o lsreipl chreipl chshut lsshut
 
 install: all
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 chreipl $(USRSBINDIR)
+	$(INSTALL) chreipl $(USRSBINDIR)
 	ln -f -s chreipl $(USRSBINDIR)/lsreipl
 	ln -f -s chreipl $(USRSBINDIR)/chshut
 	ln -f -s chreipl $(USRSBINDIR)/lsshut
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/chreipl.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/lsreipl.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/lsshut.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 man/chshut.8 $(MANDIR)/man8
+	$(INSTALL_DATA) man/chreipl.8 $(MANDIR)/man8
+	$(INSTALL_DATA) man/lsreipl.8 $(MANDIR)/man8
+	$(INSTALL_DATA) man/lsshut.8 $(MANDIR)/man8
+	$(INSTALL_DATA) man/chshut.8 $(MANDIR)/man8
 
 .PHONY: all install clean
 
Index: s390-tools-1.30.0/ziomon/Makefile
===================================================================
--- s390-tools-1.30.0.orig/ziomon/Makefile
+++ s390-tools-1.30.0/ziomon/Makefile
@@ -43,34 +43,31 @@ ziorep_utilization: ziorep_utilization.o
 install: all
 	$(SED) -e 's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 		< ziomon > $(USRSBINDIR)/ziomon;
-	chown $(OWNER).$(GROUP) $(USRSBINDIR)/ziomon;
 	chmod 755 $(USRSBINDIR)/ziomon;
 	$(SED) -e \
 		's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 		< ziomon_fcpconf > $(USRSBINDIR)/ziomon_fcpconf;
-	chown $(OWNER).$(GROUP) $(USRSBINDIR)/ziomon_fcpconf;
 	chmod 755 $(USRSBINDIR)/ziomon_fcpconf;
 	$(SED) -e \
 		's/%S390_TOOLS_VERSION%/$(S390_TOOLS_RELEASE)/' \
 		< ziorep_config > $(USRSBINDIR)/ziorep_config;
-	chown $(OWNER).$(GROUP) $(USRSBINDIR)/ziorep_config;
 	chmod 755 $(USRSBINDIR)/ziorep_config;
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_fcpconf.8 \
+	$(INSTALL) ziomon.8 $(MANDIR)/man8
+	$(INSTALL) ziomon_fcpconf.8 \
 		$(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziomon_util $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_util.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziomon_mgr $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_mgr.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziomon_zfcpdd $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziomon_zfcpdd.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziorep_config.8 $(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziorep_utilization \
+	$(INSTALL) ziomon_util $(USRSBINDIR)
+	$(INSTALL) ziomon_util.8 $(MANDIR)/man8
+	$(INSTALL) ziomon_mgr $(USRSBINDIR)
+	$(INSTALL) ziomon_mgr.8 $(MANDIR)/man8
+	$(INSTALL) ziomon_zfcpdd $(USRSBINDIR)
+	$(INSTALL) ziomon_zfcpdd.8 $(MANDIR)/man8
+	$(INSTALL) ziorep_config.8 $(MANDIR)/man8
+	$(INSTALL) ziorep_utilization \
 		$(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziorep_utilization.8 \
+	$(INSTALL) ziorep_utilization.8 \
 		$(MANDIR)/man8
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 ziorep_traffic $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 ziorep_traffic.8 \
+	$(INSTALL) ziorep_traffic $(USRSBINDIR)
+	$(INSTALL) ziorep_traffic.8 \
 		$(MANDIR)/man8
 
 uninstall:
Index: s390-tools-1.30.0/iucvterm/bin/Makefile
===================================================================
--- s390-tools-1.30.0.orig/iucvterm/bin/Makefile
+++ s390-tools-1.30.0/iucvterm/bin/Makefile
@@ -12,13 +12,9 @@ SCRIPTS = $(BIN_SCRIPTS) $(SBIN_SCRIPTS)
 all:
 check:
 install: $(SCRIPTS)
-	for prg in $(BIN_SCRIPTS); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(USRBINDIR) ; \
-	done
-	for prg in $(SBIN_SCRIPTS); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(USRSBINDIR) ; \
-	done
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -d $(INSTROOT)/var/log/ts-shell
+	$(INSTALL) $(BIN_SCRIPTS) $(USRBINDIR)
+	$(INSTALL) $(SBIN_SCRIPTS) $(USRSBINDIR)
+	$(INSTALL) -d $(INSTROOT)/var/log/ts-shell
 	ln -f -s chiucvallow $(USRSBINDIR)/lsiucvallow
 
 clean:
Index: s390-tools-1.30.0/iucvterm/doc/Makefile
===================================================================
--- s390-tools-1.30.0.orig/iucvterm/doc/Makefile
+++ s390-tools-1.30.0/iucvterm/doc/Makefile
@@ -13,7 +13,7 @@ install: install-man
 install-man: $(MANS)
 	for man in $(MANS); do \
 	  msection=`echo $$man |sed 's/.*\.\([1-9]\)$$/man\1/'` ; \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 -D $$man $(MANDIR)/$$msection/$$man ; \
+	  $(INSTALL_DATA) -D $$man $(MANDIR)/$$msection/$$man ; \
 	done
 
 clean:
Index: s390-tools-1.30.0/iucvterm/etc/Makefile
===================================================================
--- s390-tools-1.30.0.orig/iucvterm/etc/Makefile
+++ s390-tools-1.30.0/iucvterm/etc/Makefile
@@ -11,10 +11,8 @@ CONFIG_FILES = ts-shell.conf unrestricte
 all:
 check:
 install: $(CONFIG_FILES)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -d $(IUCVTERM_DIR) ; \
-	for cnf in $(CONFIG_FILES); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 $$cnf $(IUCVTERM_DIR) ; \
-	done
+	$(INSTALL) -d $(IUCVTERM_DIR)
+	$(INSTALL_DATA) $(CONFIG_FILES) $(IUCVTERM_DIR)
 
 clean:
 	-rm -f *.o ts-shell.conf
Index: s390-tools-1.30.0/iucvterm/src/Makefile
===================================================================
--- s390-tools-1.30.0.orig/iucvterm/src/Makefile
+++ s390-tools-1.30.0/iucvterm/src/Makefile
@@ -16,12 +16,8 @@ SYSTOOLS = ttyrun
 all: $(PROGRAMS) $(SYSTOOLS)
 check:
 install:
-	for prg in $(PROGRAMS); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(USRBINDIR) ; \
-	done
-	for prg in $(SYSTOOLS); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 $$prg $(BINDIR) ; \
-	done
+	$(INSTALL) $(PROGRAMS) $(USRBINDIR)
+	$(INSTALL) $(SYSTOOLS) $(BINDIR)
 
 clean:
 	-rm -f *.o $(PROGRAMS) $(SYSTOOLS)
Index: s390-tools-1.30.0/zdump/Makefile
===================================================================
--- s390-tools-1.30.0.orig/zdump/Makefile
+++ s390-tools-1.30.0/zdump/Makefile
@@ -64,9 +64,9 @@ $(OBJECTS): *.h Makefile
 zgetdump: $(OBJECTS) $(rootdir)/libutil/util_list.o $(rootdir)/libutil/util_part.o
 
 install: all
-	$(INSTALL) -d -m 755 $(MANDIR)/man8 $(BINDIR)
-	$(INSTALL) -m 755 zgetdump $(BINDIR)
-	$(INSTALL) -m 644 zgetdump.8 $(MANDIR)/man8
+	$(INSTALL) -d $(MANDIR)/man8 $(BINDIR)
+	$(INSTALL) zgetdump $(BINDIR)
+	$(INSTALL) zgetdump.8 $(MANDIR)/man8
 
 clean:
 	rm -f *.o *~ zgetdump core.*
Index: s390-tools-1.30.0/zfcpdump/Makefile
===================================================================
--- s390-tools-1.30.0.orig/zfcpdump/Makefile
+++ s390-tools-1.30.0/zfcpdump/Makefile
@@ -18,7 +18,7 @@ $(ZFCPDUMP_PART_RD): cpioinit zfcpdump_p
 	$(CPIOINIT) zfcpdump_part | gzip > $(ZFCPDUMP_PART_RD)
 
 install: all
-	$(INSTALL) -m 611 $(ZFCPDUMP_PART_RD) $(ZFCPDUMP_DIR)
+	$(INSTALL) -m 775 $(ZFCPDUMP_PART_RD) $(ZFCPDUMP_DIR)
 
 clean:
 	rm -f *.o *~ zfcpdump_part cpioinit $(ZFCPDUMP_PART_RD)
Index: s390-tools-1.30.0/hyptop/Makefile
===================================================================
--- s390-tools-1.30.0.orig/hyptop/Makefile
+++ s390-tools-1.30.0/hyptop/Makefile
@@ -35,8 +35,8 @@ $(OBJECTS): *.h Makefile
 hyptop: $(OBJECTS) $(rootdir)/libutil/util_list.o
 
 install: all
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 hyptop $(USRSBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 hyptop.8  $(MANDIR)/man8
+	$(INSTALL) -m 755 hyptop $(USRSBINDIR)
+	$(INSTALL) -m 644 hyptop.8  $(MANDIR)/man8
 
 endif
 
Index: s390-tools-1.30.0/cmsfs-fuse/Makefile
===================================================================
--- s390-tools-1.30.0.orig/cmsfs-fuse/Makefile
+++ s390-tools-1.30.0/cmsfs-fuse/Makefile
@@ -35,11 +35,11 @@ CONFIG_FILES = filetypes.conf
 cmsfs-fuse: $(OBJECTS) $(rootdir)/libutil/util_list.o
 
 install: all
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 755 cmsfs-fuse $(USRBINDIR)
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 cmsfs-fuse.1 $(MANDIR)/man1
-	$(INSTALL) -g $(GROUP) -o $(OWNER) -d $(CMSFS_FUSE_DIR)
+	$(INSTALL) -m 755 cmsfs-fuse $(USRBINDIR)
+	$(INSTALL) -m 644 cmsfs-fuse.1 $(MANDIR)/man1
+	$(INSTALL) -d $(CMSFS_FUSE_DIR)
 	for cnf in $(CONFIG_FILES); do \
-	  $(INSTALL) -g $(GROUP) -o $(OWNER) -m 644 etc/$$cnf $(CMSFS_FUSE_DIR) ; \
+	  $(INSTALL) -m 644 etc/$$cnf $(CMSFS_FUSE_DIR) ; \
 	done
 
 endif
