diff --git a/GNUmakefile.in b/GNUmakefile.in
index cebb2067d2830573defa1e89baf92824072f545a..f50bfd4175dde070dea758e013120024ba1d7f44 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -20,6 +20,13 @@ post-install:
 	@$(MAKE) -C tbsetup post-install
 	@$(MAKE) -C security post-install
 
+#
+# For installation on the control node (okay, plastic)
+# 
+control-install:
+	@$(MAKE) -C tbsetup control-install
+	@$(MAKE) -C security control-install
+
 install-mkdirs:
 	-mkdir -p $(INSTALL_TOPDIR)/locks
 	-mkdir -p $(INSTALL_TOPDIR)/log
diff --git a/security/GNUmakefile.in b/security/GNUmakefile.in
index 42915cc2c502ce77c9026e0f66b128d3cdfbd8b0..e9af1a79e9f764cbe7947cda820c366055841981 100644
--- a/security/GNUmakefile.in
+++ b/security/GNUmakefile.in
@@ -27,12 +27,18 @@ CFLAGS	= -O -g \
 suexec:	suexec.c suexec.h
 	$(CC) $(CFLAGS) -o suexec suexec.c
 
-install: $(addprefix $(INSTALL_LIBEXECDIR)/, $(BINS)) $(addprefix $(INSTALL_BINDIR)/, paperbag)
+install: $(addprefix $(INSTALL_LIBEXECDIR)/, $(BINS)) \
+	$(addprefix $(INSTALL_BINDIR)/, paperbag)
 	@echo "Don't forget to do a post-install as root"
 
 post-install:
 	chown root $(INSTALL_LIBEXECDIR)/suexec
 	chmod u+s $(INSTALL_LIBEXECDIR)/suexec
 
+#
+# Control node installation (okay, plastic)
+#
+control-install:	$(addprefix $(INSTALL_BINDIR)/, plasticwrap)
+
 clean:
 	rm -f *.o $(BINS) core
diff --git a/tbsetup/GNUmakefile.in b/tbsetup/GNUmakefile.in
index e8b85ef447a5a1872691e4b356097e15bbe6c4bb..a6563c17b8116757b97181a928042d50e4afbd7d 100644
--- a/tbsetup/GNUmakefile.in
+++ b/tbsetup/GNUmakefile.in
@@ -72,6 +72,11 @@ post-install:
 	chown root $(INSTALL_LIBEXECDIR)/console_setup
 	chmod u+s $(INSTALL_LIBEXECDIR)/console_setup
 
+#
+# Control node installation (okay, plastic)
+#
+control-install:	$(addprefix $(INSTALL_SBINDIR)/, console_setup.proxy)
+
 clean:	subdir-clean
 	rm -f *.o core tbreport