diff --git a/bootstrap.conf b/bootstrap.conf
index 4f944a9c23..22f6153f3c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -51,7 +51,6 @@ fsync
 getaddrinfo
 getcwd-lgpl
 gethostname
-getopt-posix
 getpass
 getpeername
 getsockname
diff --git a/m4/virt-driver-bhyve.m4 b/m4/virt-driver-bhyve.m4
index f89a5f841a..14b30c0b3e 100644
--- a/m4/virt-driver-bhyve.m4
+++ b/m4/virt-driver-bhyve.m4
@@ -51,9 +51,6 @@ AC_DEFUN([LIBVIRT_DRIVER_CHECK_BHYVE],[
     AM_CONDITIONAL([WITH_BHYVE], [test "$with_bhyve" = "yes"])
 ])
 
-dnl Build with gnulib's getopt which contains a reentrant interface
-AC_DEFUN([gl_REPLACE_GETOPT_ALWAYS], [])
-
 AC_DEFUN([LIBVIRT_DRIVER_RESULT_BHYVE],[
     LIBVIRT_RESULT([Bhyve], [$with_bhyve])
 ])
diff --git a/po/POTFILES b/po/POTFILES
index 35fc26c4b9..9385fc4e15 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -1,5 +1,4 @@
 gnulib/lib/gai_strerror.c
-gnulib/lib/getopt.c
 gnulib/lib/regcomp.c
 src/access/viraccessdriverpolkit.c
 src/access/viraccessmanager.c