diff --git a/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
index 61321ab36..8659b281d 100644
--- a/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
+++ b/sys-devel/gcc/gcc-8.3.0_2019_05_24.recipe
@@ -5,7 +5,7 @@ HOMEPAGE="https://gcc.gnu.org/"
 COPYRIGHT="1988-2019 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3
 	GNU LGPL v3"
-REVISION="1"
+REVISION="2"
 gccVersion="${portVersion%%_*}"
 SOURCE_URI="https://ftpmirror.gnu.org/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz
 	https://ftp.gnu.org/gnu/gcc/gcc-$gccVersion/gcc-$gccVersion.tar.xz"
@@ -290,7 +290,7 @@ INSTALL()
 		$gccLibDir/libatomic.so.$libatomicSoVersion \
 		$gccLibDir/libatomic.so.$libatomicLibVersion \
 		$libDir/
-	cp $gccLibDir/libatomic*.a $developLibDir/
+	rm $gccLibDir/libatomic*.a
 
 	# libgfortran
 	cp -d $gccLibDir/libgfortran.so \
@@ -304,28 +304,29 @@ INSTALL()
 		$gccLibDir/libgomp.so.$libgompSoVersion \
 		$gccLibDir/libgomp.so.$libgompLibVersion \
 		$libDir/
-	cp $gccLibDir/libgomp*.a $developLibDir/
+	rm $gccLibDir/libgomp*.a
 
 	# libquadmath
 	cp -d $gccLibDir/libquadmath.so \
 		$gccLibDir/libquadmath.so.$libquadmathSoVersion \
 		$gccLibDir/libquadmath.so.$libquadmathLibVersion \
 		$libDir/
-	cp $gccLibDir/libquadmath*.a $developLibDir
+	rm $gccLibDir/libquadmath*.a
 
 	# libssp
 	cp -d $gccLibDir/libssp.so \
 		$gccLibDir/libssp.so.$libsspSoVersion \
 		$gccLibDir/libssp.so.$libsspLibVersion \
 		$libDir/
-	cp $gccLibDir/libssp*.a $developLibDir
+	rm $gccLibDir/libssp.a
+	cp $gccLibDir/libssp_nonshared.a $developLibDir
 
 	# libstdc++
 	cp -d $gccLibDir/libstdc++.so \
 		$gccLibDir/libstdc++.so.$libstdcxxSoVersion \
 		$gccLibDir/libstdc++.so.$libstdcxxLibVersion \
 		$libDir/
-	cp $gccLibDir/libstdc++*.a $developLibDir/
+	rm $gccLibDir/libstdc++*.a
 
 	# libsupc++
 	libstdcxxDir=$objectsDir/$effectiveTargetMachineTriple/libstdc++-v3
@@ -385,6 +386,15 @@ INSTALL()
 		symlinkRelative -sfn $installDir/bin/$f $binDir
 	done
 
+	# symlink all libraries from libDir -> developLibDir
+	mkdir -p $developLibDir
+	for l in libatomic libgomp libquadmath libssp libgcc_s libstdc++ \
+			libsupc++; do
+		for f in $libDir/$l*; do
+			symlinkRelative -sfn $f $developLibDir/
+		done
+	done
+
 	### Cleanup ###############################################
 
 	echo "Cleanup"
@@ -428,18 +438,14 @@ INSTALL()
 		$relativeLibDir/libsupc++.so
 
 	packageEntries "syslibs_devel" \
-		$relativeDevelopLibDir/libatomic.a \
-		$relativeDevelopLibDir/libgcc.a \
-		$relativeDevelopLibDir/libgcc-kernel.a \
-		$relativeDevelopLibDir/libgcc_eh.a \
-		$relativeDevelopLibDir/libgcc_eh-kernel.a \
-		$relativeDevelopLibDir/libgomp.a \
-		$relativeDevelopLibDir/libquadmath.a \
-		$relativeDevelopLibDir/libssp.a \
-		$relativeDevelopLibDir/libssp_nonshared.a \
-		$relativeDevelopLibDir/libstdc++.a \
-		$relativeDevelopLibDir/libsupc++.a \
-		$relativeDevelopLibDir/libsupc++-kernel.a \
+		$developLibDir/*.so* \
+		$developLibDir/libgcc.a \
+		$developLibDir/libgcc-kernel.a \
+		$developLibDir/libgcc_eh.a \
+		$developLibDir/libgcc_eh-kernel.a \
+		$developLibDir/libssp_nonshared.a \
+		$developLibDir/libsupc++.a \
+		$developLibDir/libsupc++-kernel.a \
 		$relativeIncludeDir
 
 	rm -rf $includeDir