diff --git a/src/Makefile b/src/Makefile
index c72319af93..877310fe8b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3120,9 +3120,8 @@ lintinstall:
 	$(CCC) $<
 
 auto/if_perl.c: if_perl.xs
-	$(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@
 	$(PERL) $(PERL_XSUBPP) -prototypes -typemap \
-	    $(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
+	    $(PERLLIB)/ExtUtils/typemap if_perl.xs > $@
 
 auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in
 	CC="$(CC) $(OSDEF_CFLAGS)" srcdir=$(srcdir) sh $(srcdir)/osdef.sh
diff --git a/src/version.c b/src/version.c
index eef97100c7..2ff94aba6d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1822,
 /**/
     1821,
 /**/