diff --git a/audio/giada/Makefile b/audio/giada/Makefile
index 167634ec8362..6824e5df076e 100644
--- a/audio/giada/Makefile
+++ b/audio/giada/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	giada
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.17.1
+DISTVERSION=	0.18.1
 CATEGORIES=	audio
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -15,25 +15,25 @@ LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfreetype.so:print/freetype2 \
 		libjack.so:audio/jack \
 		libjansson.so:devel/jansson \
+		libpng16.so:graphics/png \
 		libpulse.so:audio/pulseaudio \
 		librtmidi.so:audio/rtmidi \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
 
-USES=		autoreconf compiler:c++14-lang gmake localbase pkgconfig xorg
-GH_TUPLE=	nlohmann:json:db78ac1d7716f56fc9f1b030b715f872f93964e4:json/src/deps/json \
-		monocasual:rtaudio:5386a90:rtaudio/src/deps/rtaudio
+USES=		cmake compiler:c++14-lang jpeg localbase pkgconfig xorg
+USE_XORG=	ice sm x11 xcursor xext xfixes xft xinerama xpm xrender
+USE_GL=		gl glu
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	monocasual
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--target=${OPSYS:tl}
-USE_XORG=	x11 xcursor xext xfixes xft xinerama xpm xrender
-
-CXXFLAGS+=	`pkg-config --cflags rtmidi`
-LDFLAGS+=	-lfltk
+GH_TUPLE=	monocasual:geompp:95ea180:geompp/src/deps/geompp \
+		nlohmann:json:db78ac1d7716f56fc9f1b030b715f872f93964e4:json/src/deps/json \
+		monocasual:rtaudio:eca6192:rtaudio/src/deps/rtaudio
 
 PLIST_FILES=	bin/${PORTNAME}
 
+do-install: # https://github.com/monocasual/giada/issues/483
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+
 .include <bsd.port.mk>
diff --git a/audio/giada/distinfo b/audio/giada/distinfo
index f470c3cccba2..7cdc35d8781c 100644
--- a/audio/giada/distinfo
+++ b/audio/giada/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1612283126
-SHA256 (monocasual-giada-v0.17.1_GH0.tar.gz) = ab88b224e619d02d880a1af5a32699ab7baf9d40cd3852c2befd3f51bc94eee4
-SIZE (monocasual-giada-v0.17.1_GH0.tar.gz) = 373284
+TIMESTAMP = 1627236459
+SHA256 (monocasual-giada-v0.18.1_GH0.tar.gz) = e1e3675fc04f95681c7b62015dfa74608f279c90947fe7025caef296a0abab97
+SIZE (monocasual-giada-v0.18.1_GH0.tar.gz) = 358133
+SHA256 (monocasual-geompp-95ea180_GH0.tar.gz) = a14c0ad9d376f2294d1b0d5c4c07a31ab2047b7b83afe738bc2f7c36869efcaf
+SIZE (monocasual-geompp-95ea180_GH0.tar.gz) = 14481
 SHA256 (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 048aa963b1d551b99c8a4c05d8e666d50c282ba745623ac1c98c6c3300af38cf
 SIZE (nlohmann-json-db78ac1d7716f56fc9f1b030b715f872f93964e4_GH0.tar.gz) = 6883371
-SHA256 (monocasual-rtaudio-5386a90_GH0.tar.gz) = 6b0241315ea640f93764b0198d3a0f63d43c21ed977c6503ae215b6f04bff9c2
-SIZE (monocasual-rtaudio-5386a90_GH0.tar.gz) = 227980
+SHA256 (monocasual-rtaudio-eca6192_GH0.tar.gz) = 44e91e8d7913c121b1c93d843ace4eea525e948b6800390448acded526785bac
+SIZE (monocasual-rtaudio-eca6192_GH0.tar.gz) = 236991