diff --git a/compat.h b/compat.h
index 8d71a9cf1..66a22640b 100644
--- a/compat.h
+++ b/compat.h
@@ -410,11 +410,6 @@ int		 asprintf(char **, const char *, ...);
 int		 vasprintf(char **, const char *, va_list);
 #endif
 
-#ifndef HAVE_FGETLN
-/* fgetln.c */
-char		*fgetln(FILE *, size_t *);
-#endif
-
 #ifndef HAVE_GETLINE
 /* getline.c */
 ssize_t		 getline(char **, size_t *, FILE *);
diff --git a/compat/fgetln.c b/compat/fgetln.c
deleted file mode 100644
index c71918cbb..000000000
--- a/compat/fgetln.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015 Joerg Jung <jung@openbsd.org>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * portable fgetln() version, NOT reentrant
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "compat.h"
-
-char *
-fgetln(FILE *fp, size_t *len)
-{
-	static char *buf = NULL;
-	static size_t bufsz = 0;
-	size_t r = 0;
-	char *p;
-	int c, e;
-
-	if (!fp || !len) {
-		errno = EINVAL;
-		return NULL;
-	}
-	if (!buf) {
-		if (!(buf = calloc(1, BUFSIZ)))
-			return NULL;
-		bufsz = BUFSIZ;
-	}
-	while ((c = getc(fp)) != EOF) {
-		buf[r++] = c;
-		if (r == bufsz) {
-			if (!(p = reallocarray(buf, 2, bufsz))) {
-				e = errno;
-				free(buf);
-				errno = e;
-				buf = NULL, bufsz = 0;
-				return NULL;
-			}
-			buf = p, bufsz = 2 * bufsz;
-		}
-		if (c == '\n')
-			break;
-	}
-	return (*len = r) ? buf : NULL;
-}
diff --git a/configure.ac b/configure.ac
index 6abb2d9d5..f65563c3e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,6 @@ AC_REPLACE_FUNCS([ \
 	clock_gettime \
 	closefrom \
 	explicit_bzero \
-	fgetln \
 	freezero \
 	getdtablecount \
 	getdtablesize \
diff --git a/prompt-history.c b/prompt-history.c
index ac99bdb95..4453a53a8 100644
--- a/prompt-history.c
+++ b/prompt-history.c
@@ -79,8 +79,9 @@ void
 prompt_load_history(void)
 {
 	FILE	*f;
-	char	*history_file, *line, *tmp;
-	size_t	 length;
+	char	*history_file, *line = NULL;
+	size_t	 length = 0;
+	ssize_t	 got;
 
 	if ((history_file = prompt_find_history_file()) == NULL)
 		return;
@@ -94,23 +95,13 @@ prompt_load_history(void)
 	}
 	free(history_file);
 
-	for (;;) {
-		if ((line = fgetln(f, &length)) == NULL)
-			break;
-
-		if (length > 0) {
-			if (line[length - 1] == '\n') {
-				line[length - 1] = '\0';
-				prompt_add_typed_history(line);
-			} else {
-				tmp = xmalloc(length + 1);
-				memcpy(tmp, line, length);
-				tmp[length] = '\0';
-				prompt_add_typed_history(tmp);
-				free(tmp);
-			}
-		}
+	while ((got = getline(&line, &length, f)) != -1) {
+		if (got > 0 && line[got - 1] == '\n')
+			line[got - 1] = '\0';
+		if (got > 0)
+			prompt_add_typed_history(line);
 	}
+	free(line);
 	fclose(f);
 }