diff --git a/sys/arch/amiga/stand/bootblock/boot/main.c b/sys/arch/amiga/stand/bootblock/boot/main.c
index 5f6772b26556..f484b29beeb1 100644
--- a/sys/arch/amiga/stand/bootblock/boot/main.c
+++ b/sys/arch/amiga/stand/bootblock/boot/main.c
@@ -1,5 +1,5 @@
 /*
- * $NetBSD: main.c,v 1.30 2016/01/04 14:10:15 phx Exp $
+ * $NetBSD: main.c,v 1.31 2016/06/11 07:01:25 dholland Exp $
  *
  *
  * Copyright (c) 1996,1999 Ignatios Souvatzis
@@ -164,7 +164,7 @@ again:
 	printf("\n");
 	printf("Boot: [%s] ", kernel_name);
 
-	gets(linebuf);
+	kgets(linebuf, sizeof(linebuf));
 
 	if (*linebuf == 'q')
 		return 1;
diff --git a/sys/arch/zaurus/stand/zboot/boot.c b/sys/arch/zaurus/stand/zboot/boot.c
index 2a6f3480083e..377942e6744c 100644
--- a/sys/arch/zaurus/stand/zboot/boot.c
+++ b/sys/arch/zaurus/stand/zboot/boot.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: boot.c,v 1.7 2016/05/31 04:13:26 dholland Exp $	*/
+/*	$NetBSD: boot.c,v 1.8 2016/06/11 06:58:42 dholland Exp $	*/
 
 /*
  * Copyright (c) 2009 NONAKA Kimihiro <nonaka@netbsd.org>
@@ -416,7 +416,7 @@ bootmenu(void)
 
 		input[0] = '\0';
 		printf("> ");
-		gets(input);
+		kgets(input, sizeof(input));
 
 		/*
 		 * Skip leading whitespace.
diff --git a/sys/arch/zaurus/stand/zboot/bootmenu.c b/sys/arch/zaurus/stand/zboot/bootmenu.c
index 1c777e8dc779..ddd8fce7557e 100644
--- a/sys/arch/zaurus/stand/zboot/bootmenu.c
+++ b/sys/arch/zaurus/stand/zboot/bootmenu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bootmenu.c,v 1.4 2014/08/10 07:40:50 isaki Exp $	*/
+/*	$NetBSD: bootmenu.c,v 1.5 2016/06/11 06:58:42 dholland Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -99,7 +99,7 @@ doboottypemenu(void)
 				printf("\nOption: [%d]:",
 				    bootcfg_info.def + 1);
 
-			gets(input);
+			kgets(input, sizeof(input));
 			choice = getchoicefrominput(input, bootcfg_info.def);
 		} else if (bootcfg_info.timeout == 0)
 			choice = bootcfg_info.def;
diff --git a/sys/lib/libsa/getfile.c b/sys/lib/libsa/getfile.c
index ef2d1e037f05..6c5c19fd2c49 100644
--- a/sys/lib/libsa/getfile.c
+++ b/sys/lib/libsa/getfile.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: getfile.c,v 1.9 2007/11/24 13:20:55 isaki Exp $	*/
+/*	$NetBSD: getfile.c,v 1.10 2016/06/11 06:59:21 dholland Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -42,7 +42,7 @@ getfile(char *prompt, int mode)
 
 	do {
 		printf("%s: ", prompt);
-		gets(buf);
+		kgets(buf, sizeof(buf));
 		if (buf[0] == CTRL('d') && buf[1] == 0)
 			return -1;
 	} while ((fd = open(buf, mode)) < 0);