diff --git a/lang/crystal/Makefile b/lang/crystal/Makefile
index 8c7a31592cf0..da68e71cab4c 100644
--- a/lang/crystal/Makefile
+++ b/lang/crystal/Makefile
@@ -1,129 +1,129 @@
 PORTNAME=	crystal
-DISTVERSION=	1.7.0
+DISTVERSION=	1.7.1
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/dmgk/crystal-bootstrap/releases/download/${BOOTSTRAP_VERSION}/:bootstrap \
 		LOCAL/dmgk/crystal:bootstrap
 DISTFILES=	${BOOTSTRAP_NAME}.tar.xz:bootstrap
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dmgk@FreeBSD.org
 COMMENT=	Language with Ruby-like syntax and static type checking
 WWW=		https://crystal-lang.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64
 ONLY_FOR_ARCHS_REASON=	requires prebuilt bootstrap compiler
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/llvm-config${LLVM_VERSION}:devel/llvm${BOOTSTRAP_LLVM_VERSION} \
 		git:devel/git
 LIB_DEPENDS=	libLLVM-${LLVM_VERSION}.so:devel/llvm${LLVM_VERSION} \
 		libevent.so:devel/libevent \
 		libffi.so:devel/libffi \
 		libgc-threaded.so:devel/boehm-gc-threaded \
 		libgmp.so:math/gmp \
 		libpcre.so:devel/pcre \
 		libxml2.so:textproc/libxml2 \
 		libyaml.so:textproc/libyaml
 RUN_DEPENDS=	pkg-config:devel/pkgconf
 
 USES=		compiler gmake pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	crystal-lang
 
 COMMIT_ID=		879691b2e326
 LLVM_VERSION?=		14
 BOOTSTRAP_LLVM_VERSION=	14
 BOOTSTRAP_VERSION=	1.5.1
 BOOTSTRAP_NAME=		crystal-${BOOTSTRAP_VERSION}-${ARCH}-llvm${BOOTSTRAP_LLVM_VERSION}
 
 MAKE_ARGS=	LLVM_CONFIG="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
 		CRYSTAL_CONFIG_PATH="lib:${PREFIX}/lib/${PORTNAME}" \
 		CRYSTAL_CONFIG_BUILD_COMMIT="${COMMIT_ID}" \
 		CRYSTAL_CACHE_DIR="${WRKDIR}/cache" \
 		FLAGS="--progress --stats --threads ${MAKE_JOBS_NUMBER} ${OPT_FLAGS}"
 
 TEST_ARGS=	${MAKE_ARGS:S/release=1//}
 TEST_TARGET=	spec
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES INTERPRETER STATIC
 OPTIONS_DEFAULT=	INTERPRETER
 
 INTERPRETER_DESC=	Enable interpreter (experimental)
 
 DEBUG_VARS=		opt_flags+="--debug" strip=
 DEBUG_VARS_OFF=		opt_flags+="--release --no-debug"
 INTERPRETER_MAKE_ARGS=	interpreter=1
 STATIC_MAKE_ARGS=	static=1
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		not supported on anything but FreeBSD
 .endif
 
 # crystal needs pkgconfig to determine SSL variants but these are not
 # present in FreeBSD base. We splice in the correct info based on
 # FreeBSD version and hope it doesn't change during minor releases.
 # See post-patch for the substitutions of these patches.
 .if ${SSL_DEFAULT} == "base"
 EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_openssl_lib__crypto.cr \
 		${PATCHDIR}/extra-patch-src_openssl_lib__ssl.cr
 .endif
 
 post-extract:
 	@${RLN} ${WRKDIR}/.build ${WRKSRC}
 	@${RLN} x86_64-freebsd ${WRKSRC}/src/lib_c/aarch64-freebsd
 	@${RLN} x86_64-freebsd ${WRKSRC}/src/lib_c/aarch64-portbld-freebsd
 	@${RLN} x86_64-freebsd ${WRKSRC}/src/lib_c/aarch64-unknown-freebsd
 
 post-patch:
 .if ${SSL_DEFAULT} == "base" && ${OSREL:R} < 15
 	@${REINPLACE_CMD} -i '' \
 		-e 's|CRYSTAL_SSL_VERSION|1.1.1|g' \
 		-e 's|CRYSTAL_SSL_LDFLAGS|${OPENSSLLIB}|g' \
 		${WRKSRC}/src/openssl/lib_ssl.cr \
 		${WRKSRC}/src/openssl/lib_crypto.cr
 .endif
 
 pre-test:
 	@${CHMOD} +x ${WRKSRC}/src/llvm/ext/find-llvm-config
 
 post-build-DOCS-on:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} docs)
 
 do-install:
 	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/.build/crystal ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${INSTALL_WRKSRC}/man/crystal.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 	(cd ${INSTALL_WRKSRC}/src && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/${PORTNAME})
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/etc/bash_completion.d
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/share/zsh/site-functions
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/etc/completion.bash \
 		${STAGEDIR}${LOCALBASE}/etc/bash_completion.d/_crystal.bash
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/etc/completion.zsh \
 		${STAGEDIR}${LOCALBASE}/share/zsh/site-functions/_crystal
 
 do-install-DOCS-on:
 	(cd ${INSTALL_WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-install-EXAMPLES-on:
 	(cd ${INSTALL_WRKSRC}/samples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .if !defined(_CRYSTAL_MAKESUM_GUARD)
 makesum:
 	${MAKE} -D_CRYSTAL_MAKESUM_GUARD makesum ARCH=${ONLY_FOR_ARCHS:O:[1]} DISTINFO_FILE=${DISTINFO_FILE}.tmp
 .for arch in ${ONLY_FOR_ARCHS:O:[2..-1]}
 	${MAKE} -D_CRYSTAL_MAKESUM_GUARD makesum ARCH=${arch} DISTINFO_FILE=${DISTINFO_FILE}.${arch}
 	${SED} 1d ${DISTINFO_FILE}.${arch} >> ${DISTINFO_FILE}.tmp
 	${RM} ${DISTINFO_FILE}.${arch}
 .endfor
 	${AWK} '!seen[$$0]++' ${DISTINFO_FILE}.tmp > ${DISTINFO_FILE}
 	${RM} ${DISTINFO_FILE}.tmp
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/crystal/distinfo b/lang/crystal/distinfo
index 5215526a2281..8535eea5adb4 100644
--- a/lang/crystal/distinfo
+++ b/lang/crystal/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1673436303
+TIMESTAMP = 1673987868
 SHA256 (crystal/crystal-1.5.1-aarch64-llvm14.tar.xz) = 62617bf7a6d38d5a980672559b680818bf35803252f69bb6ecfb33377c3b2a88
 SIZE (crystal/crystal-1.5.1-aarch64-llvm14.tar.xz) = 2085460
-SHA256 (crystal/crystal-lang-crystal-1.7.0_GH0.tar.gz) = f49682fc79e4a71e2682189a1aaa95406b1ba21f8e2a0bcecdcd311acdc4b251
-SIZE (crystal/crystal-lang-crystal-1.7.0_GH0.tar.gz) = 3121283
+SHA256 (crystal/crystal-lang-crystal-1.7.1_GH0.tar.gz) = 01781fcaaf6714556a1717749cf9bbde10836f58e9f436aedfd8b914b5fc252f
+SIZE (crystal/crystal-lang-crystal-1.7.1_GH0.tar.gz) = 3121507
 SHA256 (crystal/crystal-1.5.1-amd64-llvm14.tar.xz) = abd7cd2a798b9184d6cbb600fde29a55e196a03974c164ceac1713be264fb7ac
 SIZE (crystal/crystal-1.5.1-amd64-llvm14.tar.xz) = 2608988