diff --git a/src/auto/configure b/src/auto/configure
index d1359485b..205312a3b 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -14861,6 +14861,8 @@ else
 $as_echo "no" >&6; }
 fi
 
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5
 $as_echo_n "checking linker --as-needed support... " >&6; }
 LINK_AS_NEEDED=
diff --git a/src/configure.ac b/src/configure.ac
index 010cc8f09..4b6794a29 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -4467,6 +4467,10 @@ else
   AC_MSG_RESULT(no)
 fi
 
+dnl $LDFLAGS is passed to glibtool in libvterm, it doesn't like a space
+dnl between "-L" and the path that follows.
+LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'`
+
 dnl link.sh tries to avoid overlinking in a hackish way.
 dnl At least GNU ld supports --as-needed which provides the same functionality
 dnl at linker level. Let's use it.
diff --git a/src/version.c b/src/version.c
index 36aa84092..8b8a6c32a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2089,
 /**/
     2088,
 /**/