diff --git a/community/nextcloud/APKBUILD b/community/nextcloud/APKBUILD
index 2e5af0d43c6..0a38c44b47e 100644
--- a/community/nextcloud/APKBUILD
+++ b/community/nextcloud/APKBUILD
@@ -40,19 +40,21 @@ package() {
 	mkdir -p ./${wwwdir%/*}
 	cp -a "$builddir" ./$wwwdir
 
-	rm -r ./$wwwdir/config
 	chmod +x ./$wwwdir/occ
 	chmod 664 ./$wwwdir/.htaccess \
 		./$wwwdir/.user.ini
 
 	install -d -m 770 -o nextcloud -g www-data ./$confdir ./$datadir
 
-	install -m 660 -o nextcloud -g www-data \
-		"$srcdir"/$pkgname-config.php ./$confdir/config.php
+	mv ./$wwwdir/config/* ./$confdir/
+	rm -r ./$wwwdir/config
 	ln -s /$confdir ./$wwwdir/config
 
+	install -m 660 -o nextcloud -g www-data \
+		"$srcdir"/$pkgname-config.php ./$confdir/config.php
+
 	mkdir -p ./${_appsdir%/*}
-	mv "$wwwdir"/apps ./$_appsdir
+	mv ./$wwwdir/apps ./$_appsdir
 	chown -R nextcloud:www-data ./$_appsdir
 	chmod -R 770 ./$_appsdir
 	ln -s /$_appsdir ./$wwwdir/apps