diff --git a/.gnulib b/.gnulib
index 6cc32c63e8..8d807a99c6 160000
--- a/.gnulib
+++ b/.gnulib
@@ -1 +1 @@
-Subproject commit 6cc32c63e80bc1a30c521b2f07f2b54909b59892
+Subproject commit 8d807a99c6e8eecd2a9cf7c7b5d48ec0b2c934f8
diff --git a/bootstrap b/bootstrap
index 294c0bce44..f060bab83e 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2014-12-08.12; # UTC
+scriptversion=2016-01-24.06; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -42,7 +42,7 @@ export LC_ALL
 
 local_gl_dir=gl
 
-# Honour $PERL, but work even if there is none
+# Honor $PERL, but work even if there is none.
 PERL="${PERL-perl}"
 
 me=$0
@@ -1021,6 +1021,6 @@ echo "$0: done.  Now you can run './configure'."
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/tests/virstringtest.c b/tests/virstringtest.c
index 7a1dcfdfb8..63b80098fd 100644
--- a/tests/virstringtest.c
+++ b/tests/virstringtest.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Red Hat, Inc.
+ * Copyright (C) 2012-2016 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,7 +23,6 @@
 #include <stdlib.h>
 
 #include "testutils.h"
-#include "intprops.h"
 #include "verify.h"
 #include "virerror.h"
 #include "viralloc.h"
@@ -409,13 +408,11 @@ struct stringToLongData {
 
 /* This test makes assumptions about our compilation platform that are
  * not guaranteed by POSIX.  Good luck to you if you are crazy enough
- * to try and port libvirt to a platform with 16-bit int.  */
+ * to try and port libvirt to a platform with 16-bit int.  Gnulib
+ * already assumes that signed integers are two's complement. */
 verify(sizeof(int) == 4);
-verify(TYPE_TWOS_COMPLEMENT(int));
 verify(sizeof(long) == sizeof(int) || sizeof(long) == sizeof(long long));
-verify(TYPE_TWOS_COMPLEMENT(long));
 verify(sizeof(long long) == 8);
-verify(TYPE_TWOS_COMPLEMENT(long long));
 
 static int
 testStringToLong(const void *opaque)