diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 68b60d9274c5..c41b4c9625fe 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -1,55 +1,59 @@
 PORTNAME=	png
-DISTVERSION=	1.6.39
+DISTVERSION=	1.6.40
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lib${PORTNAME}/lib${PORTNAME}16/${DISTVERSION}/
-PATCH_SITES=	SF/lib${PORTNAME}-apng/lib${PORTNAME}16/${DISTVERSION}/
+#PATCH_SITES=	SF/lib${PORTNAME}-apng/lib${PORTNAME}16/${DISTVERSION}/
+# Keep this because you normally need to keep patch version in sync with release 
+PATCH_SITES=	SF/lib${PORTNAME}-apng/lib${PORTNAME}16/1.6.39/
 DISTNAME=	lib${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Library for manipulating PNG images
 WWW=		http://www.libpng.org/pub/png/libpng.html
 
 LICENSE=	Libpng
 LICENSE_GROUPS=	FSF GPL OSI
 LICENSE_NAME=	libpng License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cmake:testing cpe pathfix tar:xz
 CPE_PRODUCT=	libpng
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	PNG_TESTS
 CMAKE_TESTING_ON=	PNG_TESTS
 
 OPTIONS_DEFINE=	APNG SIMD
 OPTIONS_DEFAULT=APNG
 OPTIONS_DEFAULT_aarch64=	SIMD
 OPTIONS_DEFAULT_amd64=	SIMD
 OPTIONS_DEFAULT_powerpc64le=	SIMD
 # arm/arm_init.c:43:6: error: "No support for run-time ARM Neon checking; use compile-time options"
 .ifdef QEMU_EMULATING
 OPTIONS_EXCLUDE_armv6=	SIMD
 OPTIONS_EXCLUDE_armv7=	SIMD
 .endif
 
 APNG_DESC=Enable Animated PNG support
 
 SIMD_CMAKE_BOOL=	PNG_HARDWARE_OPTIMIZATIONS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64 && ${PORT_OPTIONS:MSIMD}
 USES+=		compiler:c11
 CFLAGS+=	-maltivec -mvsx
 .endif
 
 .if ${PORT_OPTIONS:MAPNG} || make(makesum)
-PATCHFILES=	${DISTNAME}-apng.patch.gz:-p1
+#PATCHFILES=	${DISTNAME}-apng.patch.gz:-p1
+# Keep this because you normally need to keep patch version in sync with release
+PATCHFILES=	lib${PORTNAME}-1.6.39-apng.patch.gz:-p1
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|CMAKE_DEBUG_POSTFIX "d"|CMAKE_DEBUG_POSTFIX ""|g' \
+	@${REINPLACE_CMD} -e 's|PNG_DEBUG_POSTFIX "d"|PNG_DEBUG_POSTFIX ""|g' \
 		${PATCH_WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/png/distinfo b/graphics/png/distinfo
index ccbd60962dfa..1a40b83917c9 100644
--- a/graphics/png/distinfo
+++ b/graphics/png/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1669932270
-SHA256 (libpng-1.6.39.tar.xz) = 1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
-SIZE (libpng-1.6.39.tar.xz) = 1020552
+TIMESTAMP = 1687685650
+SHA256 (libpng-1.6.40.tar.xz) = 535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1
+SIZE (libpng-1.6.40.tar.xz) = 1021332
 SHA256 (libpng-1.6.39-apng.patch.gz) = 4ac4b6eaba00cde212c48db65cb94291073febca22c5c79fda87091502e80cfd
 SIZE (libpng-1.6.39-apng.patch.gz) = 10730
diff --git a/graphics/png/pkg-plist b/graphics/png/pkg-plist
index ec9ed3264e6b..78d92d166877 100644
--- a/graphics/png/pkg-plist
+++ b/graphics/png/pkg-plist
@@ -1,23 +1,23 @@
 bin/libpng-config
 bin/libpng16-config
 bin/png-fix-itxt
 bin/pngfix
 include/libpng16/png.h
 include/libpng16/pngconf.h
 include/libpng16/pnglibconf.h
 include/png.h
 include/pngconf.h
 include/pnglibconf.h
 lib/libpng.a
 lib/libpng.so
 lib/libpng/libpng16-%%CMAKE_BUILD_TYPE%%.cmake
 lib/libpng/libpng16.cmake
 lib/libpng16.a
 lib/libpng16.so
 lib/libpng16.so.16
-lib/libpng16.so.16.39.0
+lib/libpng16.so.16.40.0
 libdata/pkgconfig/libpng.pc
 libdata/pkgconfig/libpng16.pc
 share/man/man3/libpng.3.gz
 share/man/man3/libpngpf.3.gz
 share/man/man5/png.5.gz