diff --git a/src/Makefile b/src/Makefile
index aca1236..0012309 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2107,7 +2107,7 @@
 # TESTING
 #
 # Execute the test scripts and the unittests.
-test check: scripttests unittests
+test check: scripttests unittests test_libvterm
 
 # Execute the test scripts.  Run these after compiling Vim, before installing.
 # This doesn't depend on $(VIMTARGET), because that won't work when configure
@@ -2159,6 +2159,10 @@
 run_message_test: $(MESSAGE_TEST_TARGET)
 	$(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed;
 
+# Run the libvterm tests.
+test_libvterm:
+	cd libvterm; $(MAKE) -f Makefile test CC="$(CC)"
+
 # Run individual OLD style test.
 # These do not depend on the executable, compile it when needed.
 test1 \
diff --git a/src/libvterm/Makefile b/src/libvterm/Makefile
index 05f68dd..6eacab7 100644
--- a/src/libvterm/Makefile
+++ b/src/libvterm/Makefile
@@ -8,8 +8,7 @@
   LIBTOOL +=--quiet
 endif
 
-# override CFLAGS +=-Wall -Iinclude -std=c99 -DINLINE="static inline" -DUSE_INLINE
-override CFLAGS +=-Wall -Iinclude -std=c90 -Wpedantic -DINLINE=""
+override CFLAGS +=-Wall -Iinclude -std=c99 -Wpedantic -DINLINE=""
 
 ifeq ($(shell uname),SunOS)
   override CFLAGS +=-D__EXTENSIONS__ -D_XPG6 -D__XOPEN_OR_POSIX
diff --git a/src/version.c b/src/version.c
index aafd4cb..4e79d28 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    592,
+/**/
     591,
 /**/
     590,