diff --git a/media-video/vlc/additional-files/vlc.rdef b/media-video/vlc/additional-files/vlc.rdef
deleted file mode 100644
index 9f13da20a..000000000
--- a/media-video/vlc/additional-files/vlc.rdef
+++ /dev/null
@@ -1,47 +0,0 @@
-
-resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
-
-resource app_version {
-       major  = @MAJOR@,
-       middle = @MIDDLE@,
-       minor  = @MINOR@,
-
-       variety = B_APPV_FINAL,
-       internal = 0,
-
-       short_info = "VideoLAN Client",
-       long_info = "A multi-platform multimedia player."
-};
-
-resource app_signature "@APP_SIGNATURE@";
-
-resource file_types message {
-       "types" = "application/x-asf",
-       "types" = "audio",
-       "types" = "video"
-};
-
-resource vector_icon {
-       $"6E6369660A0500020006023B69C90000000000003B23A04AC3EF4AE6A9007C45"
-       $"03FFD3893303F2A541020006033D79BF0000000000003D324D49E2A74A24F500"
-       $"FFE8CF7FD18021FFF49119020006023AB37E0000000000003D324D4B3D534961"
-       $"EB00A94604FFDC7D0B020016033B480D0000000000003AC58F49C2784A87EA00"
-       $"FF7FCCFFE4020006033BDD210000000000003B67CD49C2A749821E00FFE8CF7F"
-       $"B96205FFD47505020006033AA07A0000000000003A50B649C2784A547F00FFE8"
-       $"CF7FC36E0AFFEA87130200060338E8A800000000000038905449C28F47E0EE00"
-       $"FFE8CF7FC57210FFF491190401780C0605E202426045574E6048604A60465746"
-       $"0605F2032E484C42B54E42B54EC06FB49E3D22BFB322BD632238B54EBCA8B49B"
-       $"38B54E0A063A3C224C224E425E584858460A073F523F42C738C1713A3C224C42"
-       $"5BC60BC5400A055846C738C1713F423F52C60BC5400A04425E425B584658480A"
-       $"04224E224C425B425E02062EC3102EC3102EC4993D52345246524CC3104CC499"
-       $"4CC310C3A2BFF9C3A2BFF949C18B3D4744473647B978BFFE31C18BB978BFFE02"
-       $"063D4736474447C3A2BFF94AC128C3A2BFF9C2C4BD00C2C4BD0047BE1B3D3E43"
-       $"3E373EBA5939BA85BE1BBA5939B978BFFEB978BFFE30C1280206C2C4BD0047BE"
-       $"1BC2C4BD00C1E3B9F8C1E3B9F845BB0D3D3542353835BB36B9FB35BB0DBB36B9"
-       $"FBBA5939BA593933BE1B3D3E373E433E0206C1E3B9F845BB0DC1E3B9F8C13CB7"
-       $"B4C13CB7B443B8613D2E412E392EBBE2B7A337B861BBE2B7A3BB36B9FBBB36B9"
-       $"FB35BB0D3D35383542350206C13CB7B443B861C13CB7B442B55342B553C06FB4"
-       $"A03D22BFB322BD632238B553BCA8B49E38B553BBE2B7A3BBE2B7A337B8613D2E"
-       $"392E412E0A0A090100000A000201021001178400040A010105000A020106000A"
-       $"030103000A040104000A060107000A070109000A0502080A000A08010B00"
-};
diff --git a/media-video/vlc/additional-files/vlc.rdef.in b/media-video/vlc/additional-files/vlc.rdef.in
index 45dda4f3b..7a176cc8f 100644
--- a/media-video/vlc/additional-files/vlc.rdef.in
+++ b/media-video/vlc/additional-files/vlc.rdef.in
@@ -2,46 +2,46 @@
 resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
 
 resource app_version {
-       major  = @MAJOR@,
-       middle = @MIDDLE@,
-       minor  = @MINOR@,
+	major  = @MAJOR@,
+	middle = @MIDDLE@,
+	minor  = @MINOR@,
 
-       variety = B_APPV_FINAL,
-       internal = 0,
+	variety = B_APPV_FINAL,
+	internal = 0,
 
-       short_info = "VideoLAN Client",
-       long_info = "A multi-platform multimedia player."
+	short_info = "VideoLAN Client",
+	long_info = "@LONG_INFO@"
 };
 
-resource app_signature "application/x-vnd.qt5-vlc";
+resource app_signature "@APP_SIGNATURE@";
 
 resource file_types message {
-       "types" = "application/x-asf",
-       "types" = "audio",
-       "types" = "video"
+	"types" = "application/x-asf",
+	"types" = "audio",
+	"types" = "video"
 };
 
 resource vector_icon {
-       $"6E6369660A0500020006023B69C90000000000003B23A04AC3EF4AE6A9007C45"
-       $"03FFD3893303F2A541020006033D79BF0000000000003D324D49E2A74A24F500"
-       $"FFE8CF7FD18021FFF49119020006023AB37E0000000000003D324D4B3D534961"
-       $"EB00A94604FFDC7D0B020016033B480D0000000000003AC58F49C2784A87EA00"
-       $"FF7FCCFFE4020006033BDD210000000000003B67CD49C2A749821E00FFE8CF7F"
-       $"B96205FFD47505020006033AA07A0000000000003A50B649C2784A547F00FFE8"
-       $"CF7FC36E0AFFEA87130200060338E8A800000000000038905449C28F47E0EE00"
-       $"FFE8CF7FC57210FFF491190401780C0605E202426045574E6048604A60465746"
-       $"0605F2032E484C42B54E42B54EC06FB49E3D22BFB322BD632238B54EBCA8B49B"
-       $"38B54E0A063A3C224C224E425E584858460A073F523F42C738C1713A3C224C42"
-       $"5BC60BC5400A055846C738C1713F423F52C60BC5400A04425E425B584658480A"
-       $"04224E224C425B425E02062EC3102EC3102EC4993D52345246524CC3104CC499"
-       $"4CC310C3A2BFF9C3A2BFF949C18B3D4744473647B978BFFE31C18BB978BFFE02"
-       $"063D4736474447C3A2BFF94AC128C3A2BFF9C2C4BD00C2C4BD0047BE1B3D3E43"
-       $"3E373EBA5939BA85BE1BBA5939B978BFFEB978BFFE30C1280206C2C4BD0047BE"
-       $"1BC2C4BD00C1E3B9F8C1E3B9F845BB0D3D3542353835BB36B9FB35BB0DBB36B9"
-       $"FBBA5939BA593933BE1B3D3E373E433E0206C1E3B9F845BB0DC1E3B9F8C13CB7"
-       $"B4C13CB7B443B8613D2E412E392EBBE2B7A337B861BBE2B7A3BB36B9FBBB36B9"
-       $"FB35BB0D3D35383542350206C13CB7B443B861C13CB7B442B55342B553C06FB4"
-       $"A03D22BFB322BD632238B553BCA8B49E38B553BBE2B7A3BBE2B7A337B8613D2E"
-       $"392E412E0A0A090100000A000201021001178400040A010105000A020106000A"
-       $"030103000A040104000A060107000A070109000A0502080A000A08010B00"
+	$"6E6369660A0500020006023B69C90000000000003B23A04AC3EF4AE6A9007C45"
+	$"03FFD3893303F2A541020006033D79BF0000000000003D324D49E2A74A24F500"
+	$"FFE8CF7FD18021FFF49119020006023AB37E0000000000003D324D4B3D534961"
+	$"EB00A94604FFDC7D0B020016033B480D0000000000003AC58F49C2784A87EA00"
+	$"FF7FCCFFE4020006033BDD210000000000003B67CD49C2A749821E00FFE8CF7F"
+	$"B96205FFD47505020006033AA07A0000000000003A50B649C2784A547F00FFE8"
+	$"CF7FC36E0AFFEA87130200060338E8A800000000000038905449C28F47E0EE00"
+	$"FFE8CF7FC57210FFF491190401780C0605E202426045574E6048604A60465746"
+	$"0605F2032E484C42B54E42B54EC06FB49E3D22BFB322BD632238B54EBCA8B49B"
+	$"38B54E0A063A3C224C224E425E584858460A073F523F42C738C1713A3C224C42"
+	$"5BC60BC5400A055846C738C1713F423F52C60BC5400A04425E425B584658480A"
+	$"04224E224C425B425E02062EC3102EC3102EC4993D52345246524CC3104CC499"
+	$"4CC310C3A2BFF9C3A2BFF949C18B3D4744473647B978BFFE31C18BB978BFFE02"
+	$"063D4736474447C3A2BFF94AC128C3A2BFF9C2C4BD00C2C4BD0047BE1B3D3E43"
+	$"3E373EBA5939BA85BE1BBA5939B978BFFEB978BFFE30C1280206C2C4BD0047BE"
+	$"1BC2C4BD00C1E3B9F8C1E3B9F845BB0D3D3542353835BB36B9FB35BB0DBB36B9"
+	$"FBBA5939BA593933BE1B3D3E373E433E0206C1E3B9F845BB0DC1E3B9F8C13CB7"
+	$"B4C13CB7B443B8613D2E412E392EBBE2B7A337B861BBE2B7A3BB36B9FBBB36B9"
+	$"FB35BB0D3D35383542350206C13CB7B443B861C13CB7B442B55342B553C06FB4"
+	$"A03D22BFB322BD632238B553BCA8B49E38B553BBE2B7A3BBE2B7A337B8613D2E"
+	$"392E412E0A0A090100000A000201021001178400040A010105000A020106000A"
+	$"030103000A040104000A060107000A070109000A0502080A000A08010B00"
 };
diff --git a/media-video/vlc/vlc-0.8.6i.recipe b/media-video/vlc/vlc-0.8.6i.recipe
index 26d3ba0c8..c30af2a8f 100644
--- a/media-video/vlc/vlc-0.8.6i.recipe
+++ b/media-video/vlc/vlc-0.8.6i.recipe
@@ -9,7 +9,7 @@ REVISION="2"
 SOURCE_URI="https://download.videolan.org/pub/vlc/$portVersion/vlc-$portVersion.tar.gz"
 CHECKSUM_SHA256="e99b3b49efd8cae8cf210ca69a5c81ceeac3b2e7d2b1e79df84c9abee4aa8426"
 PATCHES="vlc-$portVersion.patchset"
-ADDITIONAL_FILES="vlc.rdef"
+ADDITIONAL_FILES="vlc.rdef.in"
 
 ARCHITECTURES="x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"
@@ -95,7 +95,7 @@ BUILD_REQUIRES="
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
-# We need a recipe for an old version of this that will still build with gcc2.
+#	We need a recipe for an old version of this that will still build with gcc2.
 #	devel:libx264$secondaryArchSuffix
 
 BUILD_PREREQUIRES="
@@ -134,12 +134,14 @@ INSTALL()
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3 | tr -d '[:alpha:]'`"
+	local LONG_INFO="$SUMMARY"
 	sed \
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
-		$portDir/additional-files/vlc.rdef > vlc.rdef
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
+		$portDir/additional-files/vlc.rdef.in > vlc.rdef
 
 	addResourcesToBinaries vlc.rdef $binDir/vlc
 	addAppDeskbarSymlink $binDir/vlc "VLC media player"
diff --git a/media-video/vlc/vlc-2.2.6.recipe b/media-video/vlc/vlc-2.2.6.recipe
index 3d78d7150..10683b964 100644
--- a/media-video/vlc/vlc-2.2.6.recipe
+++ b/media-video/vlc/vlc-2.2.6.recipe
@@ -145,9 +145,9 @@ BUILD_REQUIRES="
 	devel:libopus$secondaryArchSuffix
 	devel:libpng$secondaryArchSuffix
 	devel:libpthread_stubs$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
-	devel:libQt5Widgets$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix >= 5.7
+	devel:libQt5Gui$secondaryArchSuffix >= 5.7
+	devel:libQt5Widgets$secondaryArchSuffix >= 5.7
 	devel:libsamplerate$secondaryArchSuffix
 #	devel:libshout$secondaryArchSuffix # crashes vlc on quit. Haiku #8600
 #	devel:libschroedinger_1.0$secondaryArchSuffix # fix libschroedinger.pc
@@ -207,11 +207,13 @@ INSTALL()
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
+	local LONG_INFO="$SUMMARY"
 	sed \
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
+		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/vlc.rdef.in > vlc.rdef
 
 	addResourcesToBinaries vlc.rdef $binDir/vlc