diff --git a/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim b/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim
index e9cd76e..f50a396 100644
--- a/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim
+++ b/helpers/DATA/geoip-database-contrib/geoip-database-contrib_update.shim
@@ -20,8 +20,6 @@ GEOLITE_ASNUM_IPV6_CSV_FILE="GeoIPASNum2v6.zip"
 
 GEOIP_CSV_DIR="/usr/share/doc/geoip-database-contrib/csv/"
 
-FAILED=0
-
 mkdir -p $GEOIP_CSV_DIR
 
 for url in \
diff --git a/helpers/make-geoip-database-contrib b/helpers/make-geoip-database-contrib
index 835d5c6..adb619a 100644
--- a/helpers/make-geoip-database-contrib
+++ b/helpers/make-geoip-database-contrib
@@ -22,10 +22,14 @@ EXTERNAL='deb-src http://archive.ubuntu.com/ubuntu $UPSTREAM multiverse'
 
 . ./config
 
-sed "/exit 0/d" -i geoip-database-contrib_update
+sed "/^exit 0/d" -i geoip-database-contrib_update
 cat $DATA/geoip-database-contrib_update.shim >> geoip-database-contrib_update
 cat $DATA/copyright.shim >> debian/copyright 
 
+sed '/rm -f \/usr\/share\/GeoIP\/GeoLiteCityv6\.dat/a\
+        rm -rf /usr/share/doc/geoip-database-contrib/csv
+' -i debian/postrm
+
 changelog 'Imported into Trisquel #13927'
 
 compile