diff --git a/coreutils-df-always-hide-rootfs.patch b/coreutils-df-always-hide-rootfs.patch
index d1b859b..60f7d38 100644
--- a/coreutils-df-always-hide-rootfs.patch
+++ b/coreutils-df-always-hide-rootfs.patch
@@ -6,7 +6,7 @@ Index: coreutils-8.17/src/df.c
    if (!selected_fstype (fstype) || excluded_fstype (fstype))
      return;
  
-+  if (STRNCMP_LIT (fstype, "rootfs") == 0)
++  if (fstype && (STRNCMP_LIT (fstype, "rootfs") == 0))
 +    return;
 +
    /* If MOUNT_POINT is NULL, then the file system is not mounted, and this
diff --git a/coreutils.changes b/coreutils.changes
index 4f2ad7b..1a39af4 100644
--- a/coreutils.changes
+++ b/coreutils.changes
@@ -1,3 +1,8 @@
+Mon Dec  3 00:45:43 UTC 2012 - mail@bernhard-voelker.de
+
+- Avoid crash in "df --total" due to new
+  coreutils-df-always-hide-rootfs.patch.
+
 -------------------------------------------------------------------
 Wed Nov 28 12:25:18 UTC 2012 - rmilasan@suse.com