diff --git a/src/etc/rc.bootup b/src/etc/rc.bootup
index cc0f500322..a527fc5a07 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -197,6 +197,16 @@ echo "Setting up interfaces microcode...";
 setup_microcode();
 echo "done.\n";
 
+/* remove leftover dhcp6c lock files if they exist */
+foreach ($config['interfaces'] as $interface) {
+        if ($interface['ipaddrv6'] == "dhcp6") {
+            if (file_exists("/tmp/dhcp6c_" . $interface['if'] . "_lock")) {
+                @unlink("/tmp/dhcp6c_" . $interface['if'] . "_lock");
+                echo("Removed leftover dhcp6c lock file: " . "/tmp/dhcp6c_" . $interface['if'] . "_lock\n");
+            }
+         }
+     }
+
 /* set up interfaces */
 if (!$debugging) {
 	mute_kernel_msgs();