diff --git a/conf.d/checkfs b/conf.d/fsck
similarity index 81%
rename from conf.d/checkfs
rename to conf.d/fsck
index 351c7470..6f039451 100644
--- a/conf.d/checkfs
+++ b/conf.d/fsck
@@ -1,4 +1,4 @@
-# fsck_shutdown causes checkfs to trigger during shutdown as well as startup.
+# fsck_shutdown causes fsck to trigger during shutdown as well as startup.
 # The end result of this is that if any periodic non-root filesystem checks are
 # scheduled, under normal circumstances the actual check will happen during
 # shutdown rather than at next boot.
diff --git a/init.d/fsck b/init.d/fsck
index 01c92a69..34dd14c5 100644
--- a/init.d/fsck
+++ b/init.d/fsck
@@ -35,3 +35,9 @@ start()
 		       exec rc-abort; return 1;;
 	esac
 }
+
+stop()
+{
+	yesno "${fsck_shutdown}" && start
+	return 0
+}