diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile
index 8d007e6da449..48042ae6e3a0 100644
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@@ -1,35 +1,35 @@
 PORTNAME=	astyle
-PORTVERSION=	3.6
+PORTVERSION=	3.6.1
 CATEGORIES=	devel textproc
-MASTER_SITES=	SF/astyle/astyle/astyle%20${PORTVERSION}
+MASTER_SITES=	SF/astyle/astyle/astyle%20${PORTVERSION:R}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Source code indenter and formatter for C, C++, C\#, and Java
 WWW=		https://astyle.sourceforge.net/ \
 		https://gitlab.com/saalen/astyle
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/../../LICENSE.md
 
 USES=		compiler:c++11-lang dos2unix gmake tar:bz2
 
 ALL_TARGET=	astyle
 MAKE_ENV=	CXX="${CXX}"
 WRKSRC_SUBDIR=	build/${CHOSEN_COMPILER_TYPE}
 
 DOS2UNIX_GLOB=	*.ini
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/astyle ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/../../doc/* ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/../../file/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/astyle/distinfo b/devel/astyle/distinfo
index 0700adebc5f1..d25d0d1ee074 100644
--- a/devel/astyle/distinfo
+++ b/devel/astyle/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1724084502
-SHA256 (astyle-3.6.tar.bz2) = f894429b198b500d51a06a47d229881c5f7c8cffb42a423d646e86c53155f1a9
-SIZE (astyle-3.6.tar.bz2) = 231112
+TIMESTAMP = 1726080923
+SHA256 (astyle-3.6.1.tar.bz2) = 5fed6a274b389ba6ca2a291cbbba6b26a31dee081c03fb7d3e34d1521a2b8b52
+SIZE (astyle-3.6.1.tar.bz2) = 230500