diff --git a/src/Makefile b/src/Makefile
index 0012309..ecceaf5 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2160,8 +2160,12 @@
 	$(VALGRIND) ./$(MESSAGE_TEST_TARGET) || exit 1; echo $* passed;
 
 # Run the libvterm tests.
+# This currently doesn't work on Mac, only run on Linux for now.
 test_libvterm:
-	cd libvterm; $(MAKE) -f Makefile test CC="$(CC)"
+	@if test `uname` = "Linux"; then \
+		cd libvterm; $(MAKE) -f Makefile test \
+			CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"; \
+	fi
 
 # Run individual OLD style test.
 # These do not depend on the executable, compile it when needed.
diff --git a/src/version.c b/src/version.c
index b1de233..0a94f31 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    594,
+/**/
     593,
 /**/
     592,