diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 43d1458f229d..938b25cabb0b 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,44 +1,44 @@
 # Created by: shanee@augusta.de
 
 PORTNAME=	rosegarden
-PORTVERSION=	20.06
-PORTREVISION=	2
+DISTVERSION=	21.06.1
 CATEGORIES=	audio
-MASTER_SITES=	SF
+# MASTER_SITES=	SF
+MASTER_SITES=	https://sourceforge.net/projects/${PORTNAME}/files/${PORTNAME}/21.06/
 
 MAINTAINER=	adridg@FreeBSD.org
 COMMENT=	General purpose music editor and sequencer suite
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	dssi_osc_update:audio/dssi \
 		${LOCALBASE}/include/fftw3.h:math/fftw3
 LIB_DEPENDS=	libasound.so:audio/alsa-lib \
 		libfftw3f.so:math/fftw3-float \
 		liblrdf.so:textproc/liblrdf \
 		liblo.so:audio/liblo \
 		libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile \
 		libjack.so:audio/jack
 RUN_DEPENDS=	dssi_osc_update:audio/dssi \
 		flac:audio/flac \
 		wavpack:audio/wavpack \
 		xdg-open:devel/xdg-utils \
 		lilypond:print/lilypond
 
 USES=		alias cmake compiler:c++11-lib desktop-file-utils \
 		localbase:ldflags pkgconfig shared-mime-info tar:bzip2 \
 		qt:5 xorg
 USE_QT=		core gui network printsupport testlib widgets xml \
 		buildtools_build linguisttools_build qmake_build
 USE_XORG=	ice sm x11 xext
 
 OPTIONS_DEFINE=		LIRC
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_ON=		-DENABLE_LIRC:BOOL=ON
 
 CMAKE_ON=		USE_QT5
 
 .include <bsd.port.mk>
diff --git a/audio/rosegarden/distinfo b/audio/rosegarden/distinfo
index 311d0ffc3b45..75554eb47345 100644
--- a/audio/rosegarden/distinfo
+++ b/audio/rosegarden/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591460822
-SHA256 (rosegarden-20.06.tar.bz2) = d94c0eb0e28c51662d9056c7e50e5b394a8648442a17dacf99b9718e674e3dc5
-SIZE (rosegarden-20.06.tar.bz2) = 6821122
+TIMESTAMP = 1636127921
+SHA256 (rosegarden-21.06.1.tar.bz2) = 87750dc0b55ae27e07acc4effdc25ae5c4f6ba4ccf81ac5112abb0fed211397a
+SIZE (rosegarden-21.06.1.tar.bz2) = 6479487
diff --git a/audio/rosegarden/files/patch-src_gui_general_ThornStyle.cpp b/audio/rosegarden/files/patch-src_gui_general_ThornStyle.cpp
deleted file mode 100644
index b66fedaad34c..000000000000
--- a/audio/rosegarden/files/patch-src_gui_general_ThornStyle.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/general/ThornStyle.cpp.orig	2020-05-18 16:28:59 UTC
-+++ src/gui/general/ThornStyle.cpp
-@@ -34,6 +34,7 @@
- #include <QLabel>
- #include <QLayout>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRadioButton>
- #include <QStyleFactory>
- #include <QStyleOption>
diff --git a/audio/rosegarden/files/patch-src_gui_widgets_Panner.cpp b/audio/rosegarden/files/patch-src_gui_widgets_Panner.cpp
deleted file mode 100644
index 6f180643b039..000000000000
--- a/audio/rosegarden/files/patch-src_gui_widgets_Panner.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/gui/widgets/Panner.cpp.orig	2020-05-18 16:29:03 UTC
-+++ src/gui/widgets/Panner.cpp
-@@ -26,6 +26,7 @@
- 
- #include <QPolygon>
- #include <QMouseEvent>
-+#include <QPainterPath>
- 
- #include <iostream>
-