diff --git a/astro/josm/Makefile b/astro/josm/Makefile
index 91b46e4da6ee..2527335552c5 100644
--- a/astro/josm/Makefile
+++ b/astro/josm/Makefile
@@ -1,53 +1,53 @@
 # Created by: Gleb Smirnoff <glebius@FreeBSD.org>
 
 PORTNAME=	josm
-PORTVERSION=	18360
+PORTVERSION=	18387
 CATEGORIES=	astro java
 MASTER_SITES=	https://josm.openstreetmap.de/download/ \
 		https://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}.jar
 EXTRACT_SUFX=	# empty
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Comprehensive editor for OpenStreetMap.org database
 
 LICENSE=	GPLv2+
 
 PORTSCOUT=	ignore:1
 
 NO_WRKSUBDIR=	yes
 
 USES=		zip:infozip
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
 
 JOSM_MEMORY_LIMIT?=1024
 
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 SUB_FILES=	josm.sh
 SUB_LIST=	JARNAME=${DISTNAME} JOSM_MEMORY_LIMIT=${JOSM_MEMORY_LIMIT}
 
 PLIST_FILES=	bin/josm \
 		${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME} \
 		share/pixmaps/josm.png
 
 DESKTOP_ENTRIES="JOSM" \
 		"" \
 		"${PORTNAME}" \
 		"${PORTNAME}" \
 		"Education;Geoscience;Maps;" \
 		true
 
 pre-everything::
 	@${ECHO_CMD} "You can change limit of memory available to josm by defining"
 	@${ECHO_CMD} "JOSM_MEMORY_LIMIT variable in /etc/make.conf. Default is 1024 (MB)."
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/josm.sh ${STAGEDIR}${PREFIX}/bin/josm
 	${INSTALL_DATA} ${WRKSRC}/images/logo_32x32x32.png ${STAGEDIR}${PREFIX}/share/pixmaps/josm.png
 
 .include <bsd.port.mk>
diff --git a/astro/josm/distinfo b/astro/josm/distinfo
index 84d796368713..2dffbfbf385a 100644
--- a/astro/josm/distinfo
+++ b/astro/josm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1641848469
-SHA256 (josm-snapshot-18360.jar) = d4e3043ccb541a4c500a0a66c953f5876e604836b630a17b975ae876beb53b9b
-SIZE (josm-snapshot-18360.jar) = 16186460
+TIMESTAMP = 1646821433
+SHA256 (josm-snapshot-18387.jar) = ce41166638d2cb46a31b95f5fdd2202cf67bcebd0189a24970768df2cbffdf27
+SIZE (josm-snapshot-18387.jar) = 16234138