diff --git a/audio/yoshimi/Makefile b/audio/yoshimi/Makefile
index e4be9d0ea0a9..b12c77d0c4b6 100644
--- a/audio/yoshimi/Makefile
+++ b/audio/yoshimi/Makefile
@@ -1,34 +1,37 @@
 PORTNAME=	yoshimi
-DISTVERSION=	1.7.3
+DISTVERSION=	2.0
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Sophisticated software synthesizer
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	${LOCALBASE}/include/fftw3.h:math/fftw3 \
 		dssi>0:audio/dssi \
 		lv2>0:audio/lv2
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libfftw3f.so:math/fftw3-float \
 		libfltk.so:x11-toolkits/fltk \
 		libjack.so:audio/jack \
 		libmxml.so:textproc/mxml
 
 USES=		cmake compiler:c++11-lang gnome ncurses pkgconfig readline:port
+USE_GNOME=	cairo
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	Yoshimi
-USE_GNOME=	cairo
-INSTALLS_ICONS=	yes
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
 LDFLAGS+=		-Wl,--as-needed
+LDFLAGS+=		-largp # workaround for https://github.com/Yoshimi/yoshimi/issues/135
+
+INSTALLS_ICONS=	yes
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/audio/yoshimi/distinfo b/audio/yoshimi/distinfo
index 7d7f087c90bc..a7970af0134d 100644
--- a/audio/yoshimi/distinfo
+++ b/audio/yoshimi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1604052454
-SHA256 (Yoshimi-yoshimi-1.7.3_GH0.tar.gz) = d80cfd97a9fd89be649c767fdc26a3eccfcff4a30b290a2c9548b6fcd1203a90
-SIZE (Yoshimi-yoshimi-1.7.3_GH0.tar.gz) = 10257607
+TIMESTAMP = 1617836653
+SHA256 (Yoshimi-yoshimi-2.0_GH0.tar.gz) = 4164b7debea609aa71ab0e1f1f5eb51f9e848ba6b692d6ca1cb589d45f6bd6da
+SIZE (Yoshimi-yoshimi-2.0_GH0.tar.gz) = 8871517
diff --git a/audio/yoshimi/pkg-descr b/audio/yoshimi/pkg-descr
index 1861bf483c70..66896aa27617 100644
--- a/audio/yoshimi/pkg-descr
+++ b/audio/yoshimi/pkg-descr
@@ -1,9 +1,9 @@
 Yoshimi is an algorithmic MIDI software synthesizer, originally forked
 from ZynAddSubFX.  It synthesizes in real time, can run polyphonic or
 monophonic, with multiple simultaneous patches on one or more MIDI
 channels, and has broad microtonal capability.  It includes extensive
 addititive, subtractive, and pad synth capabilities which can be run
 simultaneously within the same patch.  It also has eight audio effects
 modules.
 
-WWW: http://yoshimi.github.io/
+WWW: https://yoshimi.github.io/