diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 6e531f3ec93..cadb3418e93 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -544,8 +544,6 @@ post_install() {
 			sed -i "s/libreoffice5.4/libreoffice/" ${DESTDIR}/usr/lib/libreoffice/share/xdg/*.desktop
 			;;
 	esac
-	# Remove any remains from not packaged files
-	rm -rf ${DESTDIR}/all
 }
 
 libreoffice-common_package() {
@@ -601,6 +599,14 @@ libreoffice-impress_package() {
 	}
 }
 
+libreoffice-kit_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmkdir usr/include
+		vcopy ${wrksrc}/include/LibreOfficeKit usr/include
+	}
+}
+
 libreoffice-math_package() {
 	short_desc+=" - Equation editor"
 	depends="libreoffice-common>=${version}_${revision}"
@@ -625,13 +631,7 @@ libreoffice-writer_package() {
 	noverifyrdeps=yes
 	pkg_install() {
 		_split writer
-	}
-}
-
-libreoffice-kit_package() {
-	short_desc+=" - development files"
-	pkg_install() {
-		vmkdir usr/include
-		vcopy ${wrksrc}/include/LibreOfficeKit usr/include
+		# Remove any remains from not packaged files
+		rm -rf ${DESTDIR}/all
 	}
 }