diff --git a/[refs] b/[refs]
index a9fde3fe1e3b..e8520c7ab873 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 440fdb53b4ae58602711b5b8c3a139ace2404dbb
+refs/heads/master: 3ca135e16a393e5c5cf6490ce751e43c59011dde
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 9acccda4fd6b..84fb8428c023 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -1319,11 +1319,12 @@ config JFFS2_LZO
 	select LZO_COMPRESS
 	select LZO_DECOMPRESS
 	depends on JFFS2_FS
-	default y
+	default n
 	help
 	  minilzo-based compression. Generally works better than Zlib.
 
-	  Say 'Y' if unsure.
+	  This feature was added in July, 2007. Say 'N' if you need
+	  compatibility with older bootloaders or kernels.
 
 config JFFS2_RTIME
 	bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS