diff --git a/debian/changelog b/debian/changelog
index a2d7a5ff4..feb3850fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -362,6 +362,7 @@ linux (4.9.5-1) UNRELEASED; urgency=medium
     (Closes: #851916)
   * [arm64] video/fbdev: Change FB from module to built-in
   * [arm64,armhf] video/fbdev: Enable FB_EFI (Closes: #851778)
+  * fs: Disable LOGFS, as it is unmaintained and will be removed in 4.10
 
   [ Salvatore Bonaccorso ]
   * tmpfs: clear S_ISGID when setting posix ACLs (CVE-2017-5551)
diff --git a/debian/config/config b/debian/config/config
index c0d954d69..c744073f9 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5279,7 +5279,7 @@ CONFIG_JFS_SECURITY=y
 ##
 ## file: fs/logfs/Kconfig
 ##
-CONFIG_LOGFS=m
+# CONFIG_LOGFS is not set
 
 ##
 ## file: fs/minix/Kconfig
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index dda72de82..900733b7f 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -674,11 +674,6 @@ CONFIG_BINFMT_MISC=m
 ##
 # CONFIG_JFS_FS is not set
 
-##
-## file: fs/logfs/Kconfig
-##
-# CONFIG_LOGFS is not set
-
 ##
 ## file: fs/ntfs/Kconfig
 ##