diff --git a/testing/commons-daemon/APKBUILD b/community/commons-daemon/APKBUILD
similarity index 96%
rename from testing/commons-daemon/APKBUILD
rename to community/commons-daemon/APKBUILD
index 2b0bb223e70..2f116f35934 100644
--- a/testing/commons-daemon/APKBUILD
+++ b/community/commons-daemon/APKBUILD
@@ -27,7 +27,7 @@ build() {
 		--host=$CHOST \
 		--prefix=/usr \
 		--with-java=/usr/lib/jvm/java-1.8-openjdk \
-		CFLAGS="-I/usr/lib/jvm/java-1.8-openjdk/include/linux"
+		CFLAGS="$CFLAGS -I/usr/lib/jvm/java-1.8-openjdk/include/linux"
 	make
 
 	# jsvc manpage
diff --git a/testing/commons-daemon/rat_workaround.patch b/community/commons-daemon/rat_workaround.patch
similarity index 100%
rename from testing/commons-daemon/rat_workaround.patch
rename to community/commons-daemon/rat_workaround.patch