diff --git a/src/if_perl.xs b/src/if_perl.xs
index a4899945fe..83f14793c2 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -61,6 +61,17 @@
 # include <perliol.h>
 #endif
 
+/* Workaround for perl < 5.8.7 */
+#ifndef PERLIO_FUNCS_DECL
+# ifdef PERLIO_FUNCS_CONST
+#  define PERLIO_FUNCS_DECL(funcs) const PerlIO_funcs funcs
+#  define PERLIO_FUNCS_CAST(funcs) (PerlIO_funcs*)(funcs)
+# else
+#  define PERLIO_FUNCS_DECL(funcs) PerlIO_funcs funcs
+#  define PERLIO_FUNCS_CAST(funcs) (funcs)
+# endif
+#endif
+
 /*
  * Work around clashes between Perl and Vim namespace.	proto.h doesn't
  * include if_perl.pro and perlsfio.pro when IN_PERL_FILE is defined, because
diff --git a/src/version.c b/src/version.c
index ea586106a3..ed479cd36b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1869,
 /**/
     1868,
 /**/