diff --git a/gnulib/lib/getprogname.h b/gnulib/lib/getprogname.h
index 68a4cb2d4..0e3dfe34d 100644
--- a/gnulib/lib/getprogname.h
+++ b/gnulib/lib/getprogname.h
@@ -19,6 +19,8 @@
 #ifndef GUESTFS_GETPROGNAME
 #define GUESTFS_GETPROGNAME
 
+#ifndef HAVE_GETPROGNAME
+
 #include <errno.h>
 
 static inline char const *
@@ -27,4 +29,6 @@ getprogname (void)
   return program_invocation_short_name;
 }
 
+#endif
+
 #endif /* GUESTFS_GETPROGNAME */
diff --git a/m4/guestfs-libraries.m4 b/m4/guestfs-libraries.m4
index 763559faa..5d3bd0bbb 100644
--- a/m4/guestfs-libraries.m4
+++ b/m4/guestfs-libraries.m4
@@ -68,6 +68,7 @@ AC_CHECK_FUNCS([\
     be32toh \
     fsync \
     futimens \
+    getprogname \
     getxattr \
     htonl \
     htons \