diff -Nru debian.orig/postrm debian/postrm
--- debian.orig/postrm	2009-07-09 18:30:21.000000000 +0200
+++ debian/postrm	2009-07-09 18:33:56.000000000 +0200
@@ -9,11 +9,18 @@
   fi
 }
 
+remove_divert_man() {
+  if [ ! -z "$(dpkg-divert --list $1)" ]; then
+    dpkg-divert --remove --package gnu-fdisk --rename \
+      --divert $1.distrib.8.gz $1.8.gz
+  fi
+}
+
 if [ "$1" = "remove" ]; then
   remove_divert /sbin/cfdisk
   remove_divert /sbin/fdisk
-  remove_divert /usr/share/man/man8/cfdisk.8.gz
-  remove_divert /usr/share/man/man8/fdisk.8.gz
+  remove_divert_man /usr/share/man/man8/cfdisk
+  remove_divert_man /usr/share/man/man8/fdisk
 fi
 
 #DEBHELPER#
diff -Nru debian.orig/preinst debian/preinst
--- debian.orig/preinst	2009-07-09 18:30:21.000000000 +0200
+++ debian/preinst	2009-07-09 18:34:49.000000000 +0200
@@ -9,11 +9,18 @@
 	fi
 }
 
+check_divert_man() {
+	if [ -z "$(dpkg-divert --list $1)" ]; then
+		dpkg-divert --add --package gnu-fdisk --rename \
+		  --divert $1.distrib.8.gz $1.8.gz
+	fi
+}
+
 if [ "$1" = "install" ] || [ "$1" = "upgrade" ]
 then
 
-	check_divert /usr/share/man/man8/cfdisk.8.gz
-	check_divert /usr/share/man/man8/fdisk.8.gz
+	check_divert_man /usr/share/man/man8/cfdisk
+	check_divert_man /usr/share/man/man8/fdisk
 	check_divert /sbin/fdisk
 	check_divert /sbin/cfdisk