diff --git a/Makefile.am b/Makefile.am
index e71c0e5..95efe23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,19 +18,10 @@ MAN_DIRS = man/ru
 
 SUBDIRS = \
 	include \
-	disk-utils \
-	fdisk \
-	getopt \
-	lib \
 	$(SHLIBS_DIRS) \
 	$(MAN_DIRS) \
-	login-utils \
-	misc-utils \
 	po \
-	sys-utils \
-	term-utils \
-	text-utils \
-	tests
+	sys-utils
 
 
 RCS_FIND_IGNORE = \( -name SCCS -o -name BitKeeper -o -name .svn -o \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index b9f263e..62bb76d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 AM_CPPFLAGS += -DTEST_PROGRAM
 
-noinst_PROGRAMS = test_blkdev test_ismounted test_wholedisk test_mangle \
+noinst_PROGRAMS = test_blkdev test_wholedisk test_mangle \
 		  test_tt test_canonicalize test_strutils test_procutils \
 		  test_at
 if LINUX
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index d51f34a..79f7ac6 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -2,11 +2,10 @@ include $(top_srcdir)/config/include-Makefile.am
 
 bin_PROGRAMS =
 sbin_PROGRAMS =
-usrbin_exec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid
-usrsbin_exec_PROGRAMS = readprofile
+usrbin_exec_PROGRAMS = flock
+usrsbin_exec_PROGRAMS = 
 
-dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
-		readprofile.8
+dist_man_MANS = flock.1
 
 if LINUX
 #
@@ -168,34 +167,9 @@ bin_PROGRAMS += arch
 dist_man_MANS += arch.1
 endif
 
-SETARCH_LINKS = linux32 linux64
+SETARCH_LINKS = 
 
-if ARCH_S390
-SETARCH_LINKS += s390 s390x
-endif
-if ARCH_I86
-SETARCH_LINKS += i386
-endif
-if ARCH_86_64
-SETARCH_LINKS += i386 x86_64
-endif
-if ARCH_PPC
-SETARCH_LINKS += ppc ppc64 ppc32
-endif
-if ARCH_SPARC
-SETARCH_LINKS += sparc sparc64 sparc32 sparc32bash
-endif
-if ARCH_MIPS
-SETARCH_LINKS += mips mips64 mips32
-endif
-if ARCH_IA64
-SETARCH_LINKS += i386 ia64
-endif
-if ARCH_HPPA
-SETARCH_LINKS += parisc parisc64 parisc32
-endif
-
-SETARCH_MAN_LINKS = $(SETARCH_LINKS:=.8)
+SETARCH_MAN_LINKS = 
 man_MANS = $(RDEV_MAN_LINKS) $(SETARCH_MAN_LINKS)
 CLEANFILES = $(man_MANS)