zconf/zcrypt : argz functions
cpuplugd : feenableexcept function

diff --git a/Makefile b/Makefile
index a760c0f..7fe2694 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ include common.mak
 LIB_DIRS = libvtoc libu2s libutil libzds libdasd libvmdump
 TOOL_DIRS = zipl zdump fdasd dasdfmt dasdview tunedasd \
 	   tape390 osasnmpd qetharp ip_watcher qethconf scripts zconf \
-	   vmconvert vmcp man mon_tools dasdinfo vmur cpuplugd ipl_tools \
+	   vmconvert vmcp man mon_tools dasdinfo vmur ipl_tools \
 	   ziomon iucvterm hyptop cmsfs-fuse qethqoat zfcpdump zdsfs cpumf \
 	   systemd hmcdrvfs cpacfstats zdev dump2tar
 SUB_DIRS = $(LIB_DIRS) $(TOOL_DIRS)
diff --git a/scripts/Makefile b/scripts/Makefile
index 94cd6e0..e2c8091 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,7 +1,7 @@
 include ../common.mak
 
-SCRIPTS	= dbginfo.sh zfcpdbf scsi_logging_level
-MAN_PAGES = dbginfo.sh.1 zfcpdbf.1
+SCRIPTS	= zfcpdbf scsi_logging_level
+MAN_PAGES = zfcpdbf.1
 
 all:
 
diff --git a/zconf/Makefile b/zconf/Makefile
index 0877c8c..e376104 100644
--- a/zconf/Makefile
+++ b/zconf/Makefile
@@ -9,7 +9,7 @@ USRSBIN_SCRIPTS = lsmem chmem lsluns
 MANPAGES= lsdasd.8 lstape.8 lscss.8 chccwdev.8 lsqeth.8 lszfcp.8 lsluns.8 \
 	  cio_ignore.8 znetconf.8 chmem.8 lsmem.8 dasdstat.8
 
-SUB_DIRS = zcrypt scm chp
+SUB_DIRS = 
 
 all: $(SUB_DIRS)