diff -Nru nfs-utils-1.2.5/debian/changelog nfs-utils-1.2.5/debian/changelog
--- nfs-utils-1.2.5/debian/changelog	2012-03-27 17:45:25.000000000 +0000
+++ nfs-utils-1.2.5/debian/changelog	2012-04-09 05:44:41.000000000 +0000
@@ -1,3 +1,12 @@
+nfs-utils (1:1.2.5-3ubuntu3) precise; urgency=low
+
+  * In some cases, /var/lib/nfs/rpc_pipefs is successfully unmounted on
+    upgrade but the directory still has contents within it.  Since this is
+    /var/lib we shouldn't assume it's ok for delete these; instead, pass
+    --ignore-fail-on-non-empty to rmdir.  LP: #954619.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 08 Apr 2012 22:44:40 -0700
+
 nfs-utils (1:1.2.5-3ubuntu2) precise; urgency=low
 
   * Fix wrong path to rpcinfo in the init script, which breaks use of nfs
diff -Nru nfs-utils-1.2.5/debian/nfs-common.postinst nfs-utils-1.2.5/debian/nfs-common.postinst
--- nfs-utils-1.2.5/debian/nfs-common.postinst	2012-03-27 17:40:11.000000000 +0000
+++ nfs-utils-1.2.5/debian/nfs-common.postinst	2012-04-09 05:43:24.000000000 +0000
@@ -58,7 +58,7 @@
 		invoke-rc.d idmapd stop
 		invoke-rc.d gssd stop
 		if [ -d /var/lib/nfs/rpc_pipefs ]; then
-			rmdir /var/lib/nfs/rpc_pipefs
+			rmdir --ignore-fail-on-non-empty /var/lib/nfs/rpc_pipefs
 		fi
 	fi