diff --git a/debian/changelog b/debian/changelog
index a1a85e4..068ee25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,18 +2,21 @@
 
   * Update d/control
     - New uploader email and URLs
-    - Debhelper to 11
+    - Debhelper compat to 13 (remove d/compat)
     - Remove dpkg versioned pre-depend, higher version in oldoldstable
-    - Standards to 4.2.1 (no changes)
+    - Standards to 4.5.1 (no changes)
     - Add Rules-Requires-Root declaration
     - Add Multi-Arch: foreign
   * Update d/copyright: refresh URLs and Debian info
-  * Update d/compat: 11 (no changes)
   * Update d/rules: install files the Debian way (and add d/install)
   * Add d/upstream/metadata: for DEP 12 compliance
   * Update d/watch: check for .gz and .xz in addition to .bz2
+  * Add convert-file-to-UTF-8.patch
+  * Add lintian overrides for correct
+    - copyright-refers-to-symlink-license
+    - repeated-path-segment
 
- -- Olek Wojnar <olekw.dev@gmail.com>  Thu, 11 Oct 2018 23:14:11 -0400
+ -- Olek Wojnar <olek@debian.org>  Thu, 21 Jan 2021 22:57:14 -0500
 
 ember-media (0.7.2.1-1) unstable; urgency=medium
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index b7a2568..443b35e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
-Uploaders: Olek Wojnar <olekw.dev@gmail.com>
-Build-Depends: debhelper (>= 11)
-Standards-Version: 4.2.1
+Uploaders: Olek Wojnar <olek@debian.org>,
+           Debian Games Team <team+pkg-games@tracker.debian.org>,
+Build-Depends: debhelper-compat (= 13)
+Standards-Version: 4.5.1
 Rules-Requires-Root: no
 Homepage: https://www.worldforge.org/
 Vcs-Git: https://salsa.debian.org/games-team/ember-media.git
diff --git a/debian/copyright b/debian/copyright
index a452b1b..5d12f3c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,8 @@
 Files: *
 Copyright: Copyright 2000-2014 The WorldForge project
 License: GPL-2+ or GFDL-NIV-1.1+
+Comment: As a courtesy, we request that you license any derivative works
+ under this same dual license.
 
 Files: media/shared/common/resources/ogre/ogre_scripts/*
 Copyright: 2000-2009 Torus Knot Software Ltd
@@ -18,7 +20,7 @@
 Files: debian/*
 Copyright: 2009, Michael Koch <konqueror@gmx.de>
            2012-2013, Stephen M. Webb <stephen.webb@bregmasoft.ca>
-           2015-2018, Olek Wojnar <olekw.dev@gmail.com>
+           2015-2021, Olek Wojnar <olek@debian.org>
 License: GPL-2+
 
 Files: media/shared/common/resources/ogre/caelum/core/*.cg
diff --git a/debian/ember-media.lintian-overrides b/debian/ember-media.lintian-overrides
new file mode 100644
index 0000000..98453ef
--- /dev/null
+++ b/debian/ember-media.lintian-overrides
@@ -0,0 +1,4 @@
+# No GFDL 1.1 license file but allows use of newer versions
+ember-media: copyright-refers-to-symlink-license
+# Path is correct
+ember-media: repeated-path-segment
diff --git a/debian/patches/convert-file-to-UTF-8.patch b/debian/patches/convert-file-to-UTF-8.patch
new file mode 100644
index 0000000..8283de0
--- /dev/null
+++ b/debian/patches/convert-file-to-UTF-8.patch
@@ -0,0 +1,16 @@
+Description: Convert file to UTF-8
+Author: Olek Wojnar <olek@debian.org>
+Forwarded: not-needed
+Last-Update: 2021-01-21
+
+--- a/media/shared/common/resources/ogre/scripts/programs/Splat.cg
++++ b/media/shared/common/resources/ogre/scripts/programs/Splat.cg
+@@ -482,7 +482,7 @@
+ //
+ // //
+ // //   SplattingShaderParallax_1_4.hlsl for PLSM2
+-// //   Xavier Verguín González
++// //   Xavier Verguín González
+ // //   October 2007
+ // //
+ // //   - 2 Coverage maps
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..63dfc42
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+convert-file-to-UTF-8.patch
diff --git a/debian/rules b/debian/rules
index 83781f9..92960b0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,4 @@
 	dh $@
 
 override_dh_install:
-	dh_install -XLICENSE -XCOPYING -X.ttf
+	dh_install -XLICENSE -XLICENSING -XCOPYING -X.ttf
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index e29e64f..4298393 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,2 +1,6 @@
+Bug-Database: https://github.com/worldforge/ember/issues
+Bug-Submit: https://github.com/worldforge/ember/issues/new
 Contact: general@worldforge.org
 Homepage: https://www.worldforge.org/
+Repository: https://svn.worldforge.org:886/svn/media/trunk/
+Repository-Browse: https://svn.worldforge.org:886/svn/media/trunk/
diff --git a/debian/watch b/debian/watch
index 437a937..a060df0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-http://sf.net/worldforge/ember-media-([\d\.]*)\.tar\.(?:gz|bz2|xz) debian uupdate
+version=4
+opts="repack" \
+  http://sf.net/worldforge/ember-media-([\d\.]*)\.tar\.(?:gz|bz2|xz) \
+  debian uupdate