diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 6523c7f9a..88fd476e4 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,7 +3,7 @@ AUX 0.5.2/0002-useful-functions.patch 1801 RMD160 5b4ca22e434a3c3d9202e5e95d7dfd
 AUX 0.5.2/0003-KV.patch 2565 RMD160 62ebe49be43f9b3691400a5a6ebf05c8cb048f0b SHA1 b61e1fe0fc49705a44b0e9fde1d8ec0cfc1e343a SHA256 44be27f8bf419489b29507a8ddab74ff890d6ebcfa316570077393f1c6bac082
 AUX 0.5.2/0004-fix-typo.patch 673 RMD160 aeeebc237042564aae1f0e09c38accec8aac3b3a SHA1 f86be91ad8f3c441af6b04fa8cb1ed99c3858a36 SHA256 7065d2368fb8dab56595a7f27d5b00c5d360eb22af35723d6cd9bf06d91b21ac
 AUX 0.5.2/0005-fix-iproute2-support.patch 835 RMD160 859e4c8d2c1c8fe8b787432beea370bc955a5e7c SHA1 0cd6fea09ca65945aa86905fc9665d8410186f3c SHA256 491c0444de2d8a11ff17343abb9295e61178db0d3b07e3b075424abe3f287827
-AUX 00-linux-link.start 220 RMD160 b0ad204479455da3c92d09d3be4134e445f629a6 SHA1 59acf956d4126a553fccd0af658307520314fa9d SHA256 30d2fcd15cb8e6cb48ff192cde52542885ed39fecf39d2d2bca8b4ddd88bd2b6
+AUX 00-linux-link.start 383 RMD160 26fcf955533ed0fec83b6a9c208310e225bac8ba SHA1 bea8d287bedbc592096c541d9ed3bf502d1bbe0b SHA256 1022f30ba59b838dd38d717f95e60e9339e7bd3ca621ca728b432ea6997b3142
 AUX 9999/0001-msg-style.patch 1714 RMD160 15a9a9075dce18fb0beece6a3324c143ec973ed2 SHA1 b9082ab1160952a3412be3deb3825d901cce5d49 SHA256 4c819af483240b1c822d25ae3e604376b6255b4577c191bddfc84c309efab08e
 AUX 9999/0002-useful-functions.patch 1801 RMD160 5b4ca22e434a3c3d9202e5e95d7dfd4518e0393a SHA1 86f4a4f49989c688269a6e1f95c27ef00f5186ca SHA256 de5e11cd8c514353a5f97b13df52a7220b1b967dd0586336d16864d6c372c62f
 AUX 9999/0003-KV.patch 2565 RMD160 62ebe49be43f9b3691400a5a6ebf05c8cb048f0b SHA1 b61e1fe0fc49705a44b0e9fde1d8ec0cfc1e343a SHA256 44be27f8bf419489b29507a8ddab74ff890d6ebcfa316570077393f1c6bac082
diff --git a/sys-apps/openrc/files/00-linux-link.start b/sys-apps/openrc/files/00-linux-link.start
index 9597fa9b6..07ac1b7aa 100755
--- a/sys-apps/openrc/files/00-linux-link.start
+++ b/sys-apps/openrc/files/00-linux-link.start
@@ -1,8 +1,19 @@
 #!/bin/sh
 
 ##adjust /usr/src/linux link if we are pretty sure we won't screw up the system
-if [ -d /usr/src/linux-`uname -r` ]
+KV=$(uname -r)
+if [ -d /usr/src/linux-${KV} ]
 then
-        unlink /usr/src/linux
-        ln -s /usr/src/linux-`uname -r` /usr/src/linux
+	if [ -L /usr/src/linux ]
+	then
+		unlink /usr/src/linux
+	fi
+
+	ln -s /usr/src/linux-${KV} /usr/src/linux
+
+	if [ -L /lib/modules/${KV}/build ]
+	then
+		unlink /lib/modules/${KV}/build
+	fi
+	ln -s /usr/src/linux-${KV} /lib/modules/${KV}/build
 fi