diff -Nru geneweb-6.08+git20181019+dfsg/debian/changelog geneweb-6.08+git20181019+dfsg/debian/changelog
--- geneweb-6.08+git20181019+dfsg/debian/changelog	2018-12-28 20:01:00.000000000 +0000
+++ geneweb-6.08+git20181019+dfsg/debian/changelog	2020-10-31 23:35:00.000000000 +0000
@@ -1,3 +1,13 @@
+geneweb (6.08+git20181019+dfsg-3) unstable; urgency=medium
+
+  * Remove -unsafe-string that is no longer needed for compilation.
+    Closes: #973190
+  * Remove select-with-translated-default-field in
+    geneweb.lintian-overrides
+  * Standards-Version: 4.5.0
+
+ -- Guillaume Brochu <guillaume.brochu@gmail.com>  Sat, 31 Oct 2020 19:35:00 -0400
+
 geneweb (6.08+git20181019+dfsg-2) unstable; urgency=medium
 
   * Fix a regression in the previous release in 0007-compile-gui.patch
diff -Nru geneweb-6.08+git20181019+dfsg/debian/control geneweb-6.08+git20181019+dfsg/debian/control
--- geneweb-6.08+git20181019+dfsg/debian/control	2018-12-28 20:01:00.000000000 +0000
+++ geneweb-6.08+git20181019+dfsg/debian/control	2020-10-31 23:35:00.000000000 +0000
@@ -2,7 +2,7 @@
 Section: misc
 Priority: optional
 Maintainer: Guillaume Brochu <guillaume.brochu@gmail.com>
-Standards-Version: 4.3.0
+Standards-Version: 4.5.0
 Build-Depends: debhelper-compat (= 11), ocaml-nox (>= 4.02), camlp5, doc-base, dh-buildinfo, iso-codes, isoquery, po-debconf, liblablgtk2-ocaml-dev, ocaml-findlib
 Homepage: https://geneweb.org
 Vcs-Git: https://salsa.debian.org/GuillaumeBrochu-guest/geneweb.git
diff -Nru geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides
--- geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides	2018-12-28 20:01:00.000000000 +0000
+++ geneweb-6.08+git20181019+dfsg/debian/geneweb.lintian-overrides	2020-10-31 23:35:00.000000000 +0000
@@ -1,4 +1,3 @@
-geneweb: select-with-translated-default-field
 geneweb: desktop-command-not-in-package usr/share/applications/geneweb.desktop usr/bin/x-www-browser
 geneweb: hardening-no-fortify-functions usr/bin/consang
 geneweb: hardening-no-fortify-functions usr/bin/ged2gwb
diff -Nru geneweb-6.08+git20181019+dfsg/debian/patches/0001-Makefile.debian.patch geneweb-6.08+git20181019+dfsg/debian/patches/0001-Makefile.debian.patch
--- geneweb-6.08+git20181019+dfsg/debian/patches/0001-Makefile.debian.patch	2018-12-24 08:41:04.000000000 +0000
+++ geneweb-6.08+git20181019+dfsg/debian/patches/0001-Makefile.debian.patch	2020-10-31 23:35:00.000000000 +0000
@@ -1,5 +1,5 @@
 From: Guillaume Brochu <guillaume.brochu@gmail.com>
-Date: Sun, 21 Oct 2018 15:02:09 -0400
+Date: Fri, 30 Oct 2020 18:56:04 -0400
 Subject: Makefile.debian
 
 1. Add differentiated Makefile.debian files for optimized and non
@@ -20,20 +20,20 @@
 
 diff --git a/tools/Makefile.debian.opt b/tools/Makefile.debian.opt
 new file mode 100644
-index 0000000..1230922
+index 0000000..68c7894
 --- /dev/null
 +++ b/tools/Makefile.debian.opt
 @@ -0,0 +1,2 @@
-+OCAMLC=ocamlc.opt -unsafe-string
-+OCAMLOPT=ocamlopt.opt -unsafe-string
++OCAMLC=ocamlc.opt
++OCAMLOPT=ocamlopt.opt
 diff --git a/tools/Makefile.debian.out b/tools/Makefile.debian.out
 new file mode 100644
-index 0000000..ab9938f
+index 0000000..9b9dfe4
 --- /dev/null
 +++ b/tools/Makefile.debian.out
 @@ -0,0 +1,2 @@
-+OCAMLC=ocamlc -unsafe-string
-+OCAMLOPT=ocamlopt -unsafe-string
++OCAMLC=ocamlc
++OCAMLOPT=ocamlopt
 diff --git a/tools/Makefile.inc.unix b/tools/Makefile.inc.unix
 index 676eb99..ba53046 100644
 --- a/tools/Makefile.inc.unix
diff -Nru geneweb-6.08+git20181019+dfsg/debian/TODO geneweb-6.08+git20181019+dfsg/debian/TODO
--- geneweb-6.08+git20181019+dfsg/debian/TODO	2018-12-24 08:41:04.000000000 +0000
+++ geneweb-6.08+git20181019+dfsg/debian/TODO	2020-10-31 23:35:00.000000000 +0000
@@ -6,12 +6,14 @@
 * Really deal with permissions : users should not be able to write
 other's databases
 
-* Support for the "status" init script argument is recommended.
-(since std-ver: 4.0.0)
+* Packages that include system services should include systemd service units to start or stop those services
+(since std-ver: 4.5.0)
+
+* Support for the "status" init script argument is encouraged.
+(since std-ver: 4.5.0)
 
 * Packages are recommended to use debhelper tools instead of invoking
 "update-rc.d" and "invoke-rc.d" directly.
 (since std-ver: 4.0.1)
   geneweb.postinst:208:   update-rc.d -f geneweb remove
   geneweb.logrotate:9:    invoke-rc.d geneweb force-reload >/dev/null
-