diff --git a/Makefile.am b/Makefile.am
index ad768762..b9e10369 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu no-dependencies
 
-SUBDIRS = doc lib m4 po src
+SUBDIRS = doc m4 po src
 
 if USE_COLOR
 SUBDIRS += syntax
diff --git a/autogen.sh b/autogen.sh
index a2ef9c11..54007223 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,49 +1,4 @@
 #!/bin/sh
 # Generate configure & friends for GIT users.
 
-gnulib_url="git://git.sv.gnu.org/gnulib.git"
-gnulib_hash="135414a7f543e4d40ad0a7cbd51885e159a6e0f4"
-
-modules="
-	futimens
-	getdelim
-	getline
-	getopt-gnu
-	glob
-	isblank
-	iswblank
-	lstat
-	mkstemps
-	nl_langinfo
-	regex
-	sigaction
-	snprintf-posix
-	stdarg
-	strcase
-	strcasestr-simple
-	strnlen
-	sys_wait
-	vsnprintf-posix
-	wchar
-	wctype-h
-	wcwidth
-"
-
-# Make sure the local gnulib git repo is up-to-date.
-if [ ! -d "gnulib" ]; then
-	git clone --depth=1111 ${gnulib_url}
-fi
-cd gnulib >/dev/null || exit 1
-curr_hash=$(git log -1 --format=%H)
-if [ "${gnulib_hash}" != "${curr_hash}" ]; then
-	git pull
-	git checkout -f ${gnulib_hash}
-fi
-cd .. >/dev/null || exit 1
-
-rm -rf lib
-./gnulib/gnulib-tool \
-	--import \
-	${modules}
-
 autoreconf -f -i -s
diff --git a/configure.ac b/configure.ac
index 23dd03c5..561a4b5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,6 @@ dnl Checks for programs.
 
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_CC
-gl_EARLY
-gl_INIT
 AC_PROG_LN_S
 AC_SEARCH_LIBS([strerror], [cposix])
 AC_SYS_LARGEFILE
@@ -551,7 +549,6 @@ AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/sample.nanorc
-lib/Makefile
 m4/Makefile
 po/Makefile.in
 src/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index a52a6a5f..adec5a13 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\" \
-	-I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" -DSYSCONFDIR=\"$(sysconfdir)\"
 
 CLEANFILES = revision.h
 
@@ -41,7 +40,7 @@ nano_SOURCES = \
 		utils.c \
 		winio.c
 
-nano_LDADD = @LIBINTL@ $(top_builddir)/lib/libgnu.a \
+nano_LDADD = @LIBINTL@ \
 		$(LIB_CLOCK_GETTIME) $(LIBTHREAD)
 
 install-exec-hook:
diff --git a/src/utils.c b/src/utils.c
index e5ec6337..5792132b 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -28,6 +28,10 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifndef REG_STARTEND
+#define REG_STARTEND (0)
+#endif
+
 /* Return the user's home directory.  We use $HOME, and if that fails,
  * we fall back on the home directory of the effective user ID. */
 void get_homedir(void)