diff --git a/distrib/utils/sysinst/arch/alpha/md.c b/distrib/utils/sysinst/arch/alpha/md.c
index 3887f042405c..b0d3a9cc07b6 100644
--- a/distrib/utils/sysinst/arch/alpha/md.c
+++ b/distrib/utils/sysinst/arch/alpha/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.42 2006/04/06 17:18:11 he Exp $	*/
+/*	$NetBSD: md.c,v 1.43 2006/09/03 10:54:41 hubertf Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -173,6 +173,11 @@ md_update(void)
 void
 md_cleanup_install(void)
 {
+	enable_rc_conf();
+
+	run_program(0, "rm -f %s", target_expand("/sysinst"));
+	run_program(0, "rm -f %s", target_expand("/.termcap"));
+	run_program(0, "rm -f %s", target_expand("/.profile"));
 }
 
 int
diff --git a/distrib/utils/sysinst/arch/macppc/md.c b/distrib/utils/sysinst/arch/macppc/md.c
index 072f6a89a9f1..b51089d23d7c 100644
--- a/distrib/utils/sysinst/arch/macppc/md.c
+++ b/distrib/utils/sysinst/arch/macppc/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.36 2006/04/05 16:55:06 garbled Exp $	*/
+/*	$NetBSD: md.c,v 1.37 2006/09/03 10:54:41 hubertf Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -175,7 +175,11 @@ md_update(void)
 void
 md_cleanup_install(void)
 {
+	enable_rc_conf();
 
+	run_program(0, "rm -f %s", target_expand("/sysinst"));
+	run_program(0, "rm -f %s", target_expand("/.termcap"));
+	run_program(0, "rm -f %s", target_expand("/.profile"));
 }
 
 int
diff --git a/distrib/utils/sysinst/arch/pc532/md.c b/distrib/utils/sysinst/arch/pc532/md.c
index 8ff70157f6fc..eb85ac396461 100644
--- a/distrib/utils/sysinst/arch/pc532/md.c
+++ b/distrib/utils/sysinst/arch/pc532/md.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.33 2006/04/05 16:55:06 garbled Exp $	*/
+/*	$NetBSD: md.c,v 1.34 2006/09/03 10:54:41 hubertf Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -117,6 +117,11 @@ md_update(void)
 void
 md_cleanup_install(void)
 {
+	enable_rc_conf();
+	
+	run_program(0, "rm -f %s", target_expand("/sysinst"));
+	run_program(0, "rm -f %s", target_expand("/.termcap"));
+	run_program(0, "rm -f %s", target_expand("/.profile"));
 }
 
 int