diff --git a/sys/arch/amiga/stand/loadkmap/Makefile.inc b/sys/arch/amiga/stand/loadkmap/Makefile.inc
index ff49d970ae54..59a50464523d 100644
--- a/sys/arch/amiga/stand/loadkmap/Makefile.inc
+++ b/sys/arch/amiga/stand/loadkmap/Makefile.inc
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.9 2000/09/17 18:24:13 is Exp $
+# $NetBSD: Makefile.inc,v 1.10 2000/09/27 08:28:34 aymeric Exp $
 
 BINDIR=/usr/share/keymaps/amiga
 MKMAN=	no
 CLEANFILES=${FILES}
 
-realall: ${PROG} ${FILES}
-
-${FILES}: ${PROG}
-	./${PROG} > $@
-
-# don't install ${PROG}
-proginstall::
+realall: ${HOSTPROG} ${FILES}
 
+${FILES}: ${HOSTPROG}
+	./${HOSTPROG} > $@
diff --git a/sys/arch/amiga/stand/loadkmap/din/Makefile b/sys/arch/amiga/stand/loadkmap/din/Makefile
index 39248c33d295..f60490b3408b 100644
--- a/sys/arch/amiga/stand/loadkmap/din/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/din/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:38 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/27 08:28:35 aymeric Exp $
 
-PROG=din-kbdmap
-MKMAN=	no
-FILES=din.map
+HOSTPROG=	din-kbdmap
+MKMAN=		no
+FILES=		din.map
 
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c b/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c
index 13373049ff70..86915f8ef4f2 100644
--- a/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/din/din-kbdmap.c
@@ -1,4 +1,6 @@
-/*	$NetBSD: din-kbdmap.c,v 1.5 1996/06/08 15:28:51 is Exp $	*/
+/*	$NetBSD: din-kbdmap.c,v 1.6 2000/09/27 08:28:35 aymeric Exp $	*/
+
+#include <unistd.h>
 
 #include "../../../dev/kbdmap.h"
 
@@ -478,7 +480,9 @@ unsigned char acctable[KBD_NUM_ACC][64] = {
 };
 
 
-main()
-{
-  write (1, &kbdmap, sizeof (kbdmap));
+int
+main(void) {
+	write(1, &kbdmap, sizeof (kbdmap));
+
+	return 0;
 }
diff --git a/sys/arch/amiga/stand/loadkmap/es/Makefile b/sys/arch/amiga/stand/loadkmap/es/Makefile
index fdca354c50b7..4654f97b45c2 100644
--- a/sys/arch/amiga/stand/loadkmap/es/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/es/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 1999/02/13 02:54:38 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2000/09/27 08:28:35 aymeric Exp $
 
-PROG=es-kbdmap
-MKMAN=	no
-FILES=es.map
+HOSTPROG=	es-kbdmap
+MKMAN=		no
+FILES=		es.map
 
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/es/es-kbdmap.c b/sys/arch/amiga/stand/loadkmap/es/es-kbdmap.c
index 4112139c1e81..d1cfe015a7c4 100644
--- a/sys/arch/amiga/stand/loadkmap/es/es-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/es/es-kbdmap.c
@@ -1,4 +1,6 @@
-/*	$NetBSD: es-kbdmap.c,v 1.1 1998/03/13 19:28:11 is Exp $	*/
+/*	$NetBSD: es-kbdmap.c,v 1.2 2000/09/27 08:28:35 aymeric Exp $	*/
+
+#include <unistd.h>
 
 #include "../../../dev/kbdmap.h"
 
@@ -478,7 +480,9 @@ unsigned char acctable[KBD_NUM_ACC][64] = {
 };
 
 
-main()
-{
-  write (1, &kbdmap, sizeof (kbdmap));
+int
+main(void) {
+	write(1, &kbdmap, sizeof (kbdmap));
+
+	return 0;
 }
diff --git a/sys/arch/amiga/stand/loadkmap/fr/Makefile b/sys/arch/amiga/stand/loadkmap/fr/Makefile
index 269c6567e837..4abcad8cd6e0 100644
--- a/sys/arch/amiga/stand/loadkmap/fr/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/fr/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 1999/02/13 02:54:38 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2000/09/27 08:28:35 aymeric Exp $
 
-PROG=fr-kbdmap
-MKMAN=	no
-FILES=fr.map
+HOSTPROG=	fr-kbdmap
+MKMAN=		no
+FILES=		fr.map
 
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/fr/fr-kbdmap.c b/sys/arch/amiga/stand/loadkmap/fr/fr-kbdmap.c
index c95a961ce1b3..fae06ef1347d 100644
--- a/sys/arch/amiga/stand/loadkmap/fr/fr-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/fr/fr-kbdmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: fr-kbdmap.c,v 1.1 1997/08/06 17:09:38 veego Exp $	*/
+/*	$NetBSD: fr-kbdmap.c,v 1.2 2000/09/27 08:28:36 aymeric Exp $	*/
 
 /*
  * Copyright (c) 1993 Markus Wild
@@ -36,6 +36,8 @@
  * edelcamp@easynet.fr 970717
  */
 
+#include <unistd.h>
+
 #include "../../../dev/kbdmap.h"
 
 /* define a default keymap. This can be changed by keyboard ioctl's 
@@ -56,7 +58,7 @@ struct kbdmap kbdmap = {
 	{
 	   {	0, '`'	},	/* 0x00 */
 	   {	0, '&'	},
-	   {	0, '\xe9'	},		/* e accent aigu */
+	   {	0, '\xe9'	},		/* e accent aigu (e acute) */
 	   {	0, '"'	},
 	   {	0, '\''	},
 	   {	0, '('	},
@@ -164,7 +166,7 @@ struct kbdmap kbdmap = {
 	   {	0, '8'	},	/* 0x08 */
 	   {	0, '9'	},
 	   {	0, '0'	},
-	   {	0, '\xb0'	},		/* symbole numero */
+	   {	0, '\xb0'	},		/* symbole numero (degree) */
 	   {	0, '_'	},
 	   {	0, '|'	},
 	   {	0, 0	},
@@ -509,7 +511,9 @@ unsigned char acctable[KBD_NUM_ACC][64] = {
 	"`äbcdëfghïjklmnöpqrstüvwxyz{|}~\177"},	/* KBD_ACC_DIER */
 };
 
-main()
-{
-	write(1, &kbdmap, sizeof(kbdmap) );
+int
+main(void) {
+	write(1, &kbdmap, sizeof(kbdmap));
+
+	return 0;
 }
diff --git a/sys/arch/amiga/stand/loadkmap/sw/Makefile b/sys/arch/amiga/stand/loadkmap/sw/Makefile
index 51aaba9b5816..3a37c3869d16 100644
--- a/sys/arch/amiga/stand/loadkmap/sw/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/sw/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 1999/02/13 02:54:38 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2000/09/27 08:28:36 aymeric Exp $
 
-PROG=sw-kbdmap
-MKMAN=	no
-FILES=sw.map
+HOSTPROG=	sw-kbdmap
+MKMAN=		no
+FILES=		sw.map
 
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c b/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c
index ac1f684c82bc..22c13491144c 100644
--- a/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/sw/sw-kbdmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sw-kbdmap.c,v 1.3 1996/06/08 15:28:58 is Exp $	*/
+/*	$NetBSD: sw-kbdmap.c,v 1.4 2000/09/27 08:28:36 aymeric Exp $	*/
 
 /*
  * Copyright (c) 1993 Markus Wild
@@ -29,6 +29,9 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
+#include <unistd.h>
+
 #include "../../../dev/kbdmap.h"
 
 /* define a default keymap. This can be changed by keyboard ioctl's 
@@ -507,7 +510,9 @@ unsigned char acctable[KBD_NUM_ACC][64] = {
 };
 
 
-main()
-{
-  write (1, &kbdmap, sizeof (kbdmap));
+int
+main(void) {
+	write(1, &kbdmap, sizeof (kbdmap));
+
+	return 0;
 }
diff --git a/sys/arch/amiga/stand/loadkmap/us/Makefile b/sys/arch/amiga/stand/loadkmap/us/Makefile
index 5192689f6a08..576bbcf62bab 100644
--- a/sys/arch/amiga/stand/loadkmap/us/Makefile
+++ b/sys/arch/amiga/stand/loadkmap/us/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 1999/02/13 02:54:38 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/27 08:28:36 aymeric Exp $
 
-PROG=us-kbdmap
-MKMAN=	no
-FILES=us.map
+HOSTPROG=	us-kbdmap
+MKMAN=		no
+FILES=		us.map
 
-.include <bsd.prog.mk>
+.include <bsd.hostprog.mk>
diff --git a/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c b/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c
index f2517bc7623c..6bd11fb98f51 100644
--- a/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c
+++ b/sys/arch/amiga/stand/loadkmap/us/us-kbdmap.c
@@ -1,4 +1,6 @@
-/*	$NetBSD: us-kbdmap.c,v 1.4 1996/06/08 15:29:04 is Exp $	*/
+/*	$NetBSD: us-kbdmap.c,v 1.5 2000/09/27 08:28:36 aymeric Exp $	*/
+
+#include <unistd.h>
 
 #include "../../../dev/kbdmap.h"
 
@@ -475,7 +477,10 @@ unsigned char acctable[KBD_NUM_ACC][64] = {
 
 	
 
-main()
+int
+main(void)
 {
-  write (1, &kbdmap, sizeof (kbdmap));
+	write (1, &kbdmap, sizeof (kbdmap));
+
+	return 0;
 }