diff --git a/localfs.service b/localfs.service
index d8ff1048..da3facec 100644
--- a/localfs.service
+++ b/localfs.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=Shadow /etc/init.d/boot.localfs
+DefaultDependencies=no
+After=local-fs.target
 
 [Service]
 RemainAfterExit=true
diff --git a/systemd.changes b/systemd.changes
index c7a7547a..47fc09ae 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug 16 17:02:27 UTC 2011 - fcrozat@suse.com
+
+- Fix localfs.service to no cause cycle and starts it after
+  local-fs.target.
+
 -------------------------------------------------------------------
 Thu Aug  4 15:59:58 UTC 2011 - fcrozat@suse.com