diff --git a/Makefile.in b/Makefile.in
index 67ea3ef88c3..0d349b60b15 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,8 +29,8 @@ PROGRAMS = \
 
 # Programs that link with libwine
 LIBPROGRAMS = \
-	debugger/winedbg \
-	programs/wineconsole/wineconsole
+	debugger \
+	programs
 
 # Libraries (not dlls) to build
 LIBRARIES = \
@@ -54,8 +54,7 @@ LIBSYMLINKS = \
 SUBDIRS = \
 	$(INSTALLSUBDIRS) \
 	libtest \
-	miscemu \
-	programs
+	miscemu
 
 # Sub-directories to run make install into
 INSTALLSUBDIRS = \
@@ -65,7 +64,7 @@ INSTALLSUBDIRS = \
 	include \
 	library \
 	ole \
-	programs/wineconsole \
+	programs \
 	server \
 	tools \
 	tsx11 \
@@ -103,7 +102,7 @@ install:: all install_wine $(INSTALLSUBDIRS:%=%/__install__)
 uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
 	cd $(bindir) && $(RM) wine
 
-$(EMUOBJS) $(PROGRAMS) $(LIBPROGRAMS) $(LIBRARIES): dummy
+$(EMUOBJS) $(PROGRAMS) $(LIBRARIES): dummy
 	@cd `dirname $@` && $(MAKE) `basename $@`
 
 # Symlinks to libraries that we need to link against
@@ -149,12 +148,6 @@ dlls: tools $(LIBRARIES)
 checklink::
 	$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(LIBWINE) $(LIBS) && $(RM) checklink
 
-install_programs: dummy
-	@cd programs && $(MAKE) install
-
-uninstall_programs: dummy
-	@cd programs && $(MAKE) uninstall
-
 checklink::
 	@cd dlls && $(MAKE) checklink
 	@cd debugger && $(MAKE) checklink
diff --git a/programs/Makefile.in b/programs/Makefile.in
index 1eae1292d7c..066c4c0cdde 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -4,38 +4,50 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 
-SUBDIRS = \
-	avitools \
-	clock \
-	cmdlgtst \
+INSTALLSUBDIRS = \
 	control \
 	notepad \
-	osversioncheck \
 	progman \
-	regapi \
 	regedit \
 	regsvr32 \
-	regtest \
 	uninstaller \
-	view \
 	wcmd \
 	wineconsole \
 	winemine \
-	winetest \
 	winhelp \
 	winver
 
-all: $(SUBDIRS)
+# Programs that are not generally useful and don't get installed
+# Use 'make everything' to build them
+OTHERSUBDIRS = \
+	avitools \
+	clock \
+	cmdlgtst \
+	osversioncheck \
+	regapi \
+	regtest \
+	view \
+	winetest
+
+SUBDIRS = $(INSTALLSUBDIRS) $(OTHERSUBDIRS)
+
+all: $(INSTALLSUBDIRS)
 
 @MAKE_RULES@
 
+everything: $(SUBDIRS)
+
+install-everything: $(SUBDIRS:%=%/__install__)
+
+uninstall-everything: $(SUBDIRS:%=%/__uninstall__)
+
+install:: $(INSTALLSUBDIRS:%=%/__install__)
+
+uninstall:: $(INSTALLSUBDIRS:%=%/__uninstall__)
+
 $(SUBDIRS:%=%/__checklink__): dummy
 	@cd `dirname $@` && $(MAKE) checklink
 
-install:: $(SUBDIRS:%=%/__install__)
-
-uninstall:: $(SUBDIRS:%=%/__uninstall__)
-
 checklink:: $(SUBDIRS:%=%/__checklink__)
 
 ### Dependencies: