diff --git a/debian/changelog b/debian/changelog
index c776cc45f..9937d141e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,9 @@ linux-2.6 (2.6.25~rc6-1~experimental.1) UNRELEASED; urgency=low
     fix the debian-installer startup hang on Qube 2700.
   * [arm/footbridge] Disable KEYS and SECURITY for smaller d-i image.
   * [arm/footbridge] Build NFS as a module to make the image smaller.
+  * [mips/r5k-ip32] Don't build in NFS.
+  * [mips/r5k-ip32] Use the generic config options for NFS, which will
+    enable NFSv4. (closes: #471007)
 
   [ Daniel Baumann ]
   * Added patch from unionfs upstream to export release_open_intent symbol.
diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32
index b1a97bb52..8861ce89b 100644
--- a/debian/config/mips/config.r5k-ip32
+++ b/debian/config/mips/config.r5k-ip32
@@ -685,18 +685,6 @@ CONFIG_CRAMFS=y
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
-CONFIG_NFS_FS=y
-# CONFIG_NFS_V3_ACL is not set
-# CONFIG_NFS_V4 is not set
-# CONFIG_NFS_DIRECTIO is not set
-CONFIG_NFSD=y
-# CONFIG_NFSD_V3_ACL is not set
-# CONFIG_NFSD_V4 is not set
-CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=y
-CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
 # CONFIG_NCP_FS is not set