diff --git a/kde-base/calligra/additional-files/braindump.rdef.in b/app-office/calligra/additional-files/braindump.rdef.in
similarity index 100%
rename from kde-base/calligra/additional-files/braindump.rdef.in
rename to app-office/calligra/additional-files/braindump.rdef.in
diff --git a/kde-base/calligra/additional-files/karbon.rdef.in b/app-office/calligra/additional-files/karbon.rdef.in
similarity index 100%
rename from kde-base/calligra/additional-files/karbon.rdef.in
rename to app-office/calligra/additional-files/karbon.rdef.in
diff --git a/kde-base/calligra/additional-files/plan.rdef.in b/app-office/calligra/additional-files/plan.rdef.in
similarity index 100%
rename from kde-base/calligra/additional-files/plan.rdef.in
rename to app-office/calligra/additional-files/plan.rdef.in
diff --git a/kde-base/calligra/additional-files/sheets.rdef.in b/app-office/calligra/additional-files/sheets.rdef.in
similarity index 100%
rename from kde-base/calligra/additional-files/sheets.rdef.in
rename to app-office/calligra/additional-files/sheets.rdef.in
diff --git a/kde-base/calligra/additional-files/stage.rdef.in b/app-office/calligra/additional-files/stage.rdef.in
similarity index 100%
rename from kde-base/calligra/additional-files/stage.rdef.in
rename to app-office/calligra/additional-files/stage.rdef.in
diff --git a/kde-base/calligra/additional-files/words.rdef.in b/app-office/calligra/additional-files/words.rdef.in
similarity index 100%
rename from kde-base/calligra/additional-files/words.rdef.in
rename to app-office/calligra/additional-files/words.rdef.in
diff --git a/kde-base/calligra/calligra-3.0.1.recipe b/app-office/calligra/calligra-3.0.1.recipe
similarity index 99%
rename from kde-base/calligra/calligra-3.0.1.recipe
rename to app-office/calligra/calligra-3.0.1.recipe
index a47132abe..d371b6869 100644
--- a/kde-base/calligra/calligra-3.0.1.recipe
+++ b/app-office/calligra/calligra-3.0.1.recipe
@@ -96,7 +96,7 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
-	extra_cmake_modules
+	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
 	devel:eigen$secondaryArchSuffix
 	devel:libboost_system$secondaryArchSuffix
@@ -154,7 +154,7 @@ BUILD_REQUIRES="
 	devel:liblcms2$secondaryArchSuffix
 	devel:libodfgen_0.1$secondaryArchSuffix
 	devel:libpoppler${secondaryArchSuffix}_qt5
-	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libQt5WebKitWidgets$secondaryArchSuffix
 	devel:librevenge_0.0$secondaryArchSuffix
 	devel:libvisio_0.1$secondaryArchSuffix
diff --git a/kde-base/calligra/patches/calligra-3.0.1.patchset b/app-office/calligra/patches/calligra-3.0.1.patchset
similarity index 100%
rename from kde-base/calligra/patches/calligra-3.0.1.patchset
rename to app-office/calligra/patches/calligra-3.0.1.patchset