diff --git a/build.xml b/build.xml
index 0a8bfd21..9ebc5475 100644
--- a/build.xml
+++ b/build.xml
@@ -836,21 +836,15 @@
 		</copy>
 
 		<!-- merge all filebot related packages into a single package source file -->
-		<property prefix="filebot-node" url="https://raw.githubusercontent.com/filebot/filebot-node/master/package.properties" />
-		<property prefix="java-installer" url="https://raw.githubusercontent.com/rednoah/java-installer/master/package.properties" />
 		<package-source file="${dir.dist}/website/syno/index.json">
 			<keyring file="${dir.installer}/gpg/FileBot.pub" />
-			<spk file="${dir.cache}/package-source/filebot-${version}-noarch.spk" url="http://downloads.sourceforge.net/project/filebot/filebot/FileBot_${version}/filebot-${version}-noarch.spk">
+			<spk file="${dir.release}/filebot-${version}-noarch.spk">
+				<info name="link" value="http://downloads.sourceforge.net/project/filebot/filebot/FileBot_${version}/filebot-${version}-noarch.spk" />
 				<thumbnail url="http://app.filebot.net/syno/filebot-thumbnail.png" />
 				<snapshot url="http://app.filebot.net/syno/filebot-snapshot.png" />
 			</spk>
-			<spk file="${dir.cache}/package-source/${filebot-node.package}-${filebot-node.version}-noarch.spk" url="http://downloads.sourceforge.net/project/filebot/filebot-node/${filebot-node.package}-${filebot-node.version}/${filebot-node.package}-${filebot-node.version}-noarch.spk">
-				<thumbnail url="http://app.filebot.net/syno/filebot-node-thumbnail.png" />
-				<snapshot url="http://app.filebot.net/syno/filebot-node-snapshot.png" />
-			</spk>
-			<spk file="${dir.cache}/package-source/${java-installer.package}-${java-installer.version}-noarch.spk" url="https://github.com/rednoah/java-installer/releases/download/${java-installer.version}/${java-installer.package}-${java-installer.version}-noarch.spk">
-				<thumbnail url="http://app.filebot.net/syno/java-thumbnail.png" />
-			</spk>
+			<source url="https://raw.githubusercontent.com/filebot/filebot-node/master/spksrc.json" />
+			<source url="https://raw.githubusercontent.com/rednoah/java-installer/master/spksrc.json" />
 		</package-source>
 
 		<!-- upload -->
diff --git a/lib/jars/ant-spk.jar b/lib/jars/ant-spk.jar
index 211fe335..9742fa0a 100644
Binary files a/lib/jars/ant-spk.jar and b/lib/jars/ant-spk.jar differ