diff --git a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
index f8df0ef187..c4eea317bc 100644
--- a/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
+++ b/meta-networking/recipes-daemons/autofs/autofs_5.0.7.bb
@@ -96,7 +96,12 @@ do_configure_prepend () {
 }
 
 do_install_append () {
-    test -d ${D}/run && rmdir ${D}/run
+    if [ -d ${D}/run ]; then
+	rmdir ${D}/run
+    fi
+    if [ -d ${D}${localstatedir}/run ]; then
+	rmdir ${D}${localstatedir}/run
+    fi
 }
 
 INSANE_SKIP_${PN} = "dev-so"