--- a/debian/prerm	Tue Jun 03 22:26:47 2003 +0100
+++ b/debian/prerm	Tue Jun 03 22:31:11 2003 +0100
@@ -1,9 +1,7 @@
 #!/bin/sh
-# $Id: prerm 499 2003-03-29 06:57:20Z godisch $
+# $Id: prerm 544 2003-06-03 21:31:11Z godisch $
 
 set -e
-. /usr/share/debconf/confmodule
-db_version 2.0
 
 if [ -x /usr/sbin/invoke-rc.d ]; then
 	invoke-rc.d noffle stop
@@ -12,11 +10,15 @@
 fi
 
 if [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	db_version 2.0
 	db_get noffle/port
 	port="$RET"
-	[ -z "$port" -o "$port" = 119 ] && port=nntp || :
+	if [ -z "$port" -o "$port" = 119 ]; then
+		port=nntp
+	fi
 	update-inetd --disable $port
+	db_stop
 fi
 
-db_stop
 exit 0