diff --git a/app-arch/p7zip/sources/p7zip-expander-rules b/app-arch/p7zip/additional-files/p7zip-expander-rules
similarity index 100%
rename from app-arch/p7zip/sources/p7zip-expander-rules
rename to app-arch/p7zip/additional-files/p7zip-expander-rules
diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe
index 4b17b1c39..27974a978 100644
--- a/app-arch/p7zip/p7zip-9.20.1.recipe
+++ b/app-arch/p7zip/p7zip-9.20.1.recipe
@@ -5,11 +5,13 @@ SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.
 CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
 LICENSE="GNU LGPL v2.1"
 COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
-REVISION="4"
+REVISION="5"
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PATCHES="p7zip-9.20.1.patch"
 
+ADDITIONAL_FILES="p7zip-expander-rules"
+
 PROVIDES="
 	p7zip = $portVersion
 	cmd:7za = $portVersion compat >= 9
@@ -41,5 +43,6 @@ INSTALL()
 
 	expanderRulesDir=$dataDir/expander/rules
 	mkdir -p $expanderRulesDir
-	cp "$portDir/sources/p7zip-expander-rules" "$expanderRulesDir/p7zip"
+	cp "$portDir/additional-files/p7zip-expander-rules" \
+		"$expanderRulesDir/p7zip"
 }
diff --git a/app-arch/xz_utils/sources/xz_utils-expander-rules b/app-arch/xz_utils/additional-files/xz_utils-expander-rules
similarity index 100%
rename from app-arch/xz_utils/sources/xz_utils-expander-rules
rename to app-arch/xz_utils/additional-files/xz_utils-expander-rules
diff --git a/app-arch/xz_utils/xz_utils-5.0.4.recipe b/app-arch/xz_utils/xz_utils-5.0.4.recipe
index a0c2295df..182e5ca37 100644
--- a/app-arch/xz_utils/xz_utils-5.0.4.recipe
+++ b/app-arch/xz_utils/xz_utils-5.0.4.recipe
@@ -8,7 +8,7 @@ LICENSE="
 	GNU GPL v3
 	"
 COPYRIGHT="2005-2012 Lasse Collin"
-REVISION="1"
+REVISION="2"
 ARCHITECTURES="x86 x86_64"
 if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
 	# x86_gcc2 is fine as primary target architecture as long as we're building
@@ -19,6 +19,8 @@ else
 fi
 SECONDARY_ARCHITECTURES="x86"
 
+ADDITIONAL_FILES="xz_utils-expander-rules"
+
 # On x86_gcc2 we don't want to install the commands in bin/<arch>/, but in bin/.
 commandSuffix=$secondaryArchSuffix
 commandBinDir=$binDir
@@ -83,7 +85,8 @@ INSTALL()
 
 	expanderRulesDir=$dataDir/expander/rules
 	mkdir -p $expanderRulesDir
-	cp "$portDir/sources/xz_utils-expander-rules" "$expanderRulesDir/xz_utils"
+	cp "$portDir/additional-files/xz_utils-expander-rules" \
+		"$expanderRulesDir/xz_utils"
 
 	prepareInstalledDevelLibs liblzma
 }
diff --git a/haiku-data/timgmsoundfont/sources/Installing alternative sound fonts b/haiku-data/timgmsoundfont/additional-files/Installing alternative sound fonts
similarity index 100%
rename from haiku-data/timgmsoundfont/sources/Installing alternative sound fonts
rename to haiku-data/timgmsoundfont/additional-files/Installing alternative sound fonts
diff --git a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe
index 3cc3e7d4a..5ab8ee577 100644
--- a/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe
+++ b/haiku-data/timgmsoundfont/timgmsoundfont-2004_01_24.recipe
@@ -5,10 +5,12 @@ LICENSE="Public Domain"
 COPYRIGHT="2004 Tim Brechbill"
 SRC_URI="http://ocmnet.com/saxguru/TimGM6mb.sf2#noarchive"
 CHECKSUM_MD5="1f569cc40159a6bd9250f816225ae222"
-REVISION="3"
+REVISION="4"
 ARCHITECTURES="any"
 DISABLE_SOURCE_PACKAGE=yes
 
+ADDITIONAL_FILES="Installing alternative sound fonts"
+
 PROVIDES="
 	timgmsoundfont = $portVersion compat >= 0
 	"
@@ -29,7 +31,8 @@ INSTALL()
 {
 	synthDir=$dataDir/synth
 	mkdir -p $synthDir
-	cp TimGM6mb.sf2 "$portDir/sources/Installing alternative sound fonts" \
+	cp TimGM6mb.sf2 \
+		"$portDir/additional-files/Installing alternative sound fonts" \
 		$synthDir
 	ln -s TimGM6mb.sf2 $synthDir/big_synth.sy
 	# TODO: Since the data directory is read-only, replacing the symlink isn't