diff --git a/PKG-INFO b/PKG-INFO
index 5c8dcf4..183684a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,21 +1,25 @@
-Metadata-Version: 1.1
-Name: pygtkspellcheck
-Version: 4.0.5
-Summary: a simple but quite powerful Python spell checking library for GtkTextViews based on Enchant
-Home-page: http://koehlma.github.com/projects/pygtkspellcheck.html
-Author: Maximilian Köhl & Carlos Jenkins
-Author-email: linuxmaxi@googlemail.com & carlos@jenkins.co.cr
-License: GPLv3+
-Download-URL: https://github.com/koehlma/pygtkspellcheck/tarball/master
-Description: A simple but quite powerful spellchecking library written in pure Python for Gtk based on Enchant. It supports PyGObject as well as PyGtk for Python 2 and 3 with automatic switching and binding detection. For automatic translation of the user interface it can use Gedit’s translation files.
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: X11 Applications :: Gnome
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development :: Localization
+Metadata-Version: 2.1
+Name: pygtkspellcheck
+Version: 4.0.6
+Summary: A Python spell-checking library for GtkTextViews based on Enchant
+Home-page: http://koehlma.github.com/projects/pygtkspellcheck.html
+Author: Maximilian Köhl
+Author-email: mail@koehlma.de
+License: GPLv3+
+Download-URL: https://github.com/koehlma/pygtkspellcheck/tarball/master
+Description: A simple but quite powerful spellchecking library written in pure Python for
+        Gtk based on Enchant. It supports PyGObject as well as PyGtk for Python 2 and
+        3 with automatic switching and binding detection. For automatic translation of
+        the user interface it can use Gedit’s translation files.
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: X11 Applications :: Gnome
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Software Development :: Localization
+Provides-Extra: building the documentation
diff --git a/debian/changelog b/debian/changelog
index b28bf7d..0123559 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-pygtkspellcheck (4.0.5-3) UNRELEASED; urgency=medium
+pygtkspellcheck (4.0.6-1) UNRELEASED; urgency=medium
 
   [ Ondřej Nový ]
   * d/control: Update Maintainer field with new Debian Python Team
@@ -9,8 +9,9 @@ pygtkspellcheck (4.0.5-3) UNRELEASED; urgency=medium
   [ Debian Janitor ]
   * Set upstream metadata fields: Bug-Submit.
   * Bump debhelper from old 12 to 13.
+  * New upstream release.
 
- -- Ondřej Nový <onovy@debian.org>  Thu, 24 Sep 2020 08:57:04 +0200
+ -- Ondřej Nový <onovy@debian.org>  Thu, 10 Mar 2022 17:10:47 -0000
 
 pygtkspellcheck (4.0.5-2) unstable; urgency=medium
 
diff --git a/doc/insert_metadata.py b/doc/insert_metadata.py
old mode 100755
new mode 100644
diff --git a/doc/make.bat b/doc/make.bat
old mode 100644
new mode 100755
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 8cbd958..69b30f2 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -61,11 +61,6 @@ Download last sources in a `ZIP`_ or `Tarball`_ file.
 .. _ZIP: https://github.com/koehlma/pygtkspellcheck/zipball/master
 .. _Tarball: https://github.com/koehlma/pygtkspellcheck/tarball/master
 
-Website
--------
-Checkout the `official project website`_ for additional information.
-
-.. _official project website: http://koehlma.github.com/projects/pygtkspellcheck.html
 
 Examples
 --------
@@ -80,4 +75,4 @@ License
 -------
 PyGtkSpellcheck is released under `GPLv3`_ or at your opinion any later version.
 
-.. _GPLv3: https://www.gnu.org/licenses/gpl-3.0.html    
\ No newline at end of file
+.. _GPLv3: https://www.gnu.org/licenses/gpl-3.0.html    
diff --git a/locale/de/pygtkspellcheck.po b/locale/de/pygtkspellcheck.po
index 4537de0..aabc557 100644
--- a/locale/de/pygtkspellcheck.po
+++ b/locale/de/pygtkspellcheck.po
@@ -45,7 +45,7 @@ msgstr "Extension  \"{}\" ist keine ZIP Datei"
 
 #: gtkspellcheck/oxt_extract.py:250
 msgid "extension \"{}\" has no valid XML dictionary registry"
-msgstr "Extension hat keine valide XML Registry"
+msgstr "Extension \"{}\" hat keine valide XML Registry"
 
 #: gtkspellcheck/oxt_extract.py:270
 msgid "unable to move extension, file with same name exists within move_path"
diff --git a/locale/nl/pygtkspellcheck.mo b/locale/nl/pygtkspellcheck.mo
new file mode 100644
index 0000000..ee6bcc4
Binary files /dev/null and b/locale/nl/pygtkspellcheck.mo differ
diff --git a/locale/nl/pygtkspellcheck.po b/locale/nl/pygtkspellcheck.po
new file mode 100644
index 0000000..dae2ba0
--- /dev/null
+++ b/locale/nl/pygtkspellcheck.po
@@ -0,0 +1,57 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: gtkspellchecker\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2002-01-29 15:32+0100\n"
+"PO-Revision-Date: 2020-01-29 15:32+0100\n"
+"Last-Translator: Pander<pander@users.sourceforge.net>\n"
+"Language-Team: \n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Poedit-SearchPath-0: ./gtkspellcheck\n"
+
+#: gtkspellcheck/spellcheck.py:98
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: gtkspellcheck/spellcheck.py:480
+msgid "(no suggestions)"
+msgstr "(geen suggesties)"
+
+#: gtkspellcheck/spellcheck.py:502 gtkspellcheck/spellcheck.py:505
+msgid "Add \"{}\" to Dictionary"
+msgstr "Voeg \"{}\" toe aan woordenboek"
+
+#: gtkspellcheck/spellcheck.py:509 gtkspellcheck/spellcheck.py:511
+msgid "Ignore All"
+msgstr "Alles negeren"
+
+#: gtkspellcheck/spellcheck.py:526 gtkspellcheck/spellcheck.py:528
+msgid "Languages"
+msgstr "Talen"
+
+#: gtkspellcheck/spellcheck.py:544 gtkspellcheck/spellcheck.py:547
+msgid "Suggestions"
+msgstr "Suggesties"
+
+#: gtkspellcheck/oxt_extract.py:244
+msgid "extension \"{}\" is not a valid ZIP file"
+msgstr "extensie \"{}\" is geen ZIP-bestand"
+
+#: gtkspellcheck/oxt_extract.py:250
+msgid "extension \"{}\" has no valid XML dictionary registry"
+msgstr "extensie \"{}\" heeft gen geldige XML-woordenboekregister"
+
+#: gtkspellcheck/oxt_extract.py:270
+msgid "unable to move extension, file with same name exists within move_path"
+msgstr ""
+"niet mogelijk om extensie te verplaatsen, bestand met dezelfde naam als "
+"move_path bestaat al"
+
+#: gtkspellcheck/oxt_extract.py:278
+msgid "unable to move extension, move_path is not a directory"
+msgstr "niet mogelijk om extensie te verplaatsen, move_path is geen map"
diff --git a/setup.cfg b/setup.cfg
index 861a9f5..4927abe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,4 @@
-[egg_info]
-tag_build = 
-tag_date = 0
-tag_svn_revision = 0
-
+[egg_info]
+tag_build = 
+tag_date = 0
+
diff --git a/setup.py b/setup.py
index d7eecc6..7a01144 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,7 @@ import distutils.cmd
 import distutils.command.install
 import distutils.command.install_data
 import os
+import re
 import sys
 
 try:
@@ -37,15 +38,36 @@ except ImportError:
     print('build_sphinx command is unavailable, please install Sphinx to solve this')
 
 __path__ = os.path.dirname(__file__)
+variables = {}
+
+def read_variables():
+    filepath = os.path.join(__path__, 'src', 'gtkspellcheck', '__init__.py')
+    with open(filepath, 'r') as fh:
+        contents = fh.read()
+
+    mapping = {
+        '__short_name__': 'name',
+        '__version__': 'version',
+        '__desc_short__': 'description',
+        '__desc_long__': 'long_description',
+        '__authors__': 'author',
+        '__emails__': 'author_email',
+        '__website__': 'url',
+        '__download_url__': 'download_url',
+    }
+    for src, dst in mapping.items():
+        pattern = "\n{} = ('+)(.+?)\\1".format(src)
+        match = re.search(pattern, contents, re.DOTALL)
+        if match:
+            variables[dst] = match.group(2).strip()
+        else:
+            raise RuntimeError('Unable to find {} string'.format(src))
+read_variables()
 
-sys.path.insert(0, os.path.join(__path__, 'src'))
 
-sys.modules['gtk'] = None
-import gtkspellcheck
-    
 if len(sys.argv) > 1 and sys.argv[1] == 'register':
     with open(os.path.join(__path__, 'doc', 'pypi', 'page.rst'), 'rb') as _pypi:
-        gtkspellcheck.__desc_long__ = _pypi.read().decode('utf-8')
+        variables['long_description']= _pypi.read().decode('utf-8')
     print('pypi registration: override `long_description`')
 
 class InstallLocale(distutils.command.install_data.install_data):
@@ -59,7 +81,7 @@ class InstallLocale(distutils.command.install_data.install_data):
             self.copy_file(os.path.join(__path__, 'locale', lang,
                                         'pygtkspellcheck.mo'),
                            os.path.join(path, locale_name))
-            
+
 commands['install_locale'] = InstallLocale
 distutils.command.install.install.sub_commands.append(('install_locale',
                                                        lambda self: True))
@@ -79,14 +101,14 @@ gtkspell = os.getenv('GTKSPELL')
 if sys.version_info.major == 2 and gtkspell is not None and gtkspell.lower() == 'true':
     py_modules.append('gtkspell')
 
-setup(name=gtkspellcheck.__short_name__,
-      version=gtkspellcheck.__version__,
-      description=gtkspellcheck.__desc_short__,
-      long_description=gtkspellcheck.__desc_long__,
-      author=gtkspellcheck.__authors__,
-      author_email=gtkspellcheck.__emails__,
-      url=gtkspellcheck.__website__,
-      download_url=gtkspellcheck.__download_url__,
+setup(name=variables['name'],
+      version=variables['version'],
+      description=variables['description'],
+      long_description=variables['long_description'],
+      author=variables['author'],
+      author_email=variables['author_email'],
+      url=variables['url'],
+      download_url=variables['download_url'],
       license='GPLv3+',
       py_modules=py_modules,
       packages=['gtkspellcheck', 'pylocales'],
diff --git a/src/gtkspellcheck/__init__.py b/src/gtkspellcheck/__init__.py
index 3b77d17..2419d3b 100644
--- a/src/gtkspellcheck/__init__.py
+++ b/src/gtkspellcheck/__init__.py
@@ -18,24 +18,25 @@
 
 from __future__ import unicode_literals
 
-__version__ = '4.0.5'
+__version__ = '4.0.6'
 __project__ = 'Python GTK Spellcheck'
 __short_name__ = 'pygtkspellcheck'
-__authors__ = 'Maximilian Köhl & Carlos Jenkins'
-__emails__ = 'linuxmaxi@googlemail.com & carlos@jenkins.co.cr'
+__authors__ = 'Maximilian Köhl'
+__emails__ = 'mail@koehlma.de'
 __website__ = 'http://koehlma.github.com/projects/pygtkspellcheck.html'
 __download_url__ = 'https://github.com/koehlma/pygtkspellcheck/tarball/master'
 __source__ = 'https://github.com/koehlma/pygtkspellcheck/'
 __vcs__ = 'git://github.com/koehlma/pygtkspellcheck.git'
 __copyright__ = '2012, Maximilian Köhl & Carlos Jenkins'
-__desc_short__ = ('a simple but quite powerful Python spell checking library '
-                  'for GtkTextViews based on Enchant')
-__desc_long__ = ('A simple but quite powerful spellchecking library written in '
-                 'pure Python for Gtk based on Enchant. It supports PyGObject '
-                 'as well as PyGtk for Python 2 and 3 with automatic switching '
-                 'and binding detection. For automatic translation of the user '
-                 'interface it can use Gedit’s translation files.')
-
+__desc_short__ = '''
+A Python spell-checking library for GtkTextViews based on Enchant
+'''
+__desc_long__ = '''
+A simple but quite powerful spellchecking library written in pure Python for
+Gtk based on Enchant. It supports PyGObject as well as PyGtk for Python 2 and
+3 with automatic switching and binding detection. For automatic translation of
+the user interface it can use Gedit’s translation files.
+'''
 __metadata__ = {'__version__' : __version__,
                 '__project__' : __project__,
                 '__short_name__' : __short_name__,
diff --git a/src/pygtkspellcheck.egg-info/PKG-INFO b/src/pygtkspellcheck.egg-info/PKG-INFO
index 5c8dcf4..183684a 100644
--- a/src/pygtkspellcheck.egg-info/PKG-INFO
+++ b/src/pygtkspellcheck.egg-info/PKG-INFO
@@ -1,21 +1,25 @@
-Metadata-Version: 1.1
-Name: pygtkspellcheck
-Version: 4.0.5
-Summary: a simple but quite powerful Python spell checking library for GtkTextViews based on Enchant
-Home-page: http://koehlma.github.com/projects/pygtkspellcheck.html
-Author: Maximilian Köhl & Carlos Jenkins
-Author-email: linuxmaxi@googlemail.com & carlos@jenkins.co.cr
-License: GPLv3+
-Download-URL: https://github.com/koehlma/pygtkspellcheck/tarball/master
-Description: A simple but quite powerful spellchecking library written in pure Python for Gtk based on Enchant. It supports PyGObject as well as PyGtk for Python 2 and 3 with automatic switching and binding detection. For automatic translation of the user interface it can use Gedit’s translation files.
-Platform: UNKNOWN
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: X11 Applications :: Gnome
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
-Classifier: Operating System :: MacOS :: MacOS X
-Classifier: Operating System :: Microsoft :: Windows
-Classifier: Operating System :: POSIX
-Classifier: Programming Language :: Python :: 2
-Classifier: Programming Language :: Python :: 3
-Classifier: Topic :: Software Development :: Localization
+Metadata-Version: 2.1
+Name: pygtkspellcheck
+Version: 4.0.6
+Summary: A Python spell-checking library for GtkTextViews based on Enchant
+Home-page: http://koehlma.github.com/projects/pygtkspellcheck.html
+Author: Maximilian Köhl
+Author-email: mail@koehlma.de
+License: GPLv3+
+Download-URL: https://github.com/koehlma/pygtkspellcheck/tarball/master
+Description: A simple but quite powerful spellchecking library written in pure Python for
+        Gtk based on Enchant. It supports PyGObject as well as PyGtk for Python 2 and
+        3 with automatic switching and binding detection. For automatic translation of
+        the user interface it can use Gedit’s translation files.
+Platform: UNKNOWN
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Environment :: X11 Applications :: Gnome
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)
+Classifier: Operating System :: MacOS :: MacOS X
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: POSIX
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 3
+Classifier: Topic :: Software Development :: Localization
+Provides-Extra: building the documentation
diff --git a/src/pygtkspellcheck.egg-info/SOURCES.txt b/src/pygtkspellcheck.egg-info/SOURCES.txt
index e7dd6ca..a520140 100644
--- a/src/pygtkspellcheck.egg-info/SOURCES.txt
+++ b/src/pygtkspellcheck.egg-info/SOURCES.txt
@@ -26,6 +26,8 @@ locale/en/pygtkspellcheck.mo
 locale/en/pygtkspellcheck.po
 locale/es/pygtkspellcheck.mo
 locale/es/pygtkspellcheck.po
+locale/nl/pygtkspellcheck.mo
+locale/nl/pygtkspellcheck.po
 src/gtkspellcheck/__init__.py
 src/gtkspellcheck/oxt_extract.py
 src/gtkspellcheck/spellcheck.py