diff --git a/graphics/p5-Cairo/Makefile b/graphics/p5-Cairo/Makefile
index e7e20d61515f..2d6f99f601dd 100644
--- a/graphics/p5-Cairo/Makefile
+++ b/graphics/p5-Cairo/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	Cairo
 PORTVERSION=	1.109
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN \
 		SF/gtk2-perl/Cairo/${PORTVERSION}
 MASTER_SITE_SUBDIR=	CPAN:XAOC
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl bindings to the cairo graphics library
 WWW=		https://gtk2-perl.sourceforge.net/
 
 LICENSE=	LGPL21
 
 BUILD_DEPENDS=	p5-ExtUtils-Depends>=0.200:devel/p5-ExtUtils-Depends \
 		p5-ExtUtils-PkgConfig>=1:devel/p5-ExtUtils-PkgConfig
 LIB_DEPENDS=	libcairo.so:graphics/cairo
 TEST_DEPENDS=	p5-Font-FreeType>=0:print/p5-Font-FreeType \
 		p5-Test-Number-Delta>=1:devel/p5-Test-Number-Delta
 
 USES=		perl5
 USE_PERL5=	configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Cairo/Cairo.so
 
 .include <bsd.port.mk>
diff --git a/graphics/p5-Cairo/files/patch-Makefile.PL b/graphics/p5-Cairo/files/patch-Makefile.PL
new file mode 100644
index 000000000000..b90da87f1d95
--- /dev/null
+++ b/graphics/p5-Cairo/files/patch-Makefile.PL
@@ -0,0 +1,14 @@
+Propagate Perl's ccflags to make sure it uses Perl's headers the same way as
+Perl itself.
+
+--- Makefile.PL.orig	2021-01-19 17:26:47 UTC
++++ Makefile.PL
+@@ -612,7 +612,7 @@ my $dep = ExtUtils::Depends->new ('Cairo');
+ push @typemaps, 'cairo-perl.typemap';
+ 
+ my $dep = ExtUtils::Depends->new ('Cairo');
+-$dep->set_inc ('-I. -I'.$autogen_dir.' '.$cairo_cfg{cflags});
++$dep->set_inc ('-I. -I'.$autogen_dir.' '.$cairo_cfg{cflags}.' '.$Config::Config{ccflags});
+ $dep->set_libs ($cairo_cfg{libs});
+ $dep->add_xs (@xs_files);
+ $dep->add_c (qw/cairo-perl-enums.c cairo-perl-flags.c/);