diff --git a/docs/authors.rst b/docs/authors.rst
index 4e41ef55..f570feb9 100644
--- a/docs/authors.rst
+++ b/docs/authors.rst
@@ -62,6 +62,7 @@ Authors
 * Heri Priyatno
 * Honza Král
 * Horst Gutmann
+* Håkon Osland
 * Igor Támara
 * Illia Volochii
 * Ivan Fisun
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 642acdd8..809c7623 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -17,6 +17,9 @@ Modifications to existing flavors:
 - Fix Belarus passport field description punctuation
   (`gh-484 <https://github.com/django/django-localflavor/pull/484>`_).
 - Change `Kiev` to `Kyiv` 🇺🇦 according to ISO_3166-2:UA
+- Update list of Norwegian counties(fylker) `according to changes at the start of 2024 <https://en.wikipedia.org/wiki/Counties_of_Norway#List_of_counties>`_
+  The changed counties are as follows: austagder and vestagder has been removed and combined into agder. hordaland and sognogfjordane has been removed and combined into vestland. nordtrondelag and sortrondelag has been removed and combined into trondelag. hedmark and oppland has been removed and combined into innlandet
+  (`gh-509 <https://github.com/django/django-localflavor/pull/509/files>`_).
 
 Other changes:
 
diff --git a/localflavor/no/no_municipalities.py b/localflavor/no/no_municipalities.py
index 1053f965..0891ed6d 100644
--- a/localflavor/no/no_municipalities.py
+++ b/localflavor/no/no_municipalities.py
@@ -1,25 +1,21 @@
 #: An alphabetical list of Norwegian municipalities (fylker) for
 #: use as `choices` in a formfield.
 MUNICIPALITY_CHOICES = (
+    ('agder', 'Agder'),
     ('akershus', 'Akershus'),
-    ('austagder', 'Aust-Agder'),
     ('buskerud', 'Buskerud'),
     ('finnmark', 'Finnmark'),
-    ('hedmark', 'Hedmark'),
-    ('hordaland', 'Hordaland'),
+    ('innlandet', 'Innlandet'),
     ('janmayen', 'Jan Mayen'),
     ('moreogromsdal', 'Møre og Romsdal'),
-    ('nordtrondelag', 'Nord-Trøndelag'),
     ('nordland', 'Nordland'),
-    ('oppland', 'Oppland'),
     ('oslo', 'Oslo'),
+    ('ostfold', 'Østfold'),
     ('rogaland', 'Rogaland'),
-    ('sognogfjordane', 'Sogn og Fjordane'),
     ('svalbard', 'Svalbard'),
-    ('sortrondelag', 'Sør-Trøndelag'),
     ('telemark', 'Telemark'),
     ('troms', 'Troms'),
-    ('vestagder', 'Vest-Agder'),
+    ('trondelag', 'Trøndelag'),
     ('vestfold', 'Vestfold'),
-    ('ostfold', 'Østfold')
+    ('vestland', 'Vestland')
 )
diff --git a/tests/test_no.py b/tests/test_no.py
index a643141e..3a104468 100644
--- a/tests/test_no.py
+++ b/tests/test_no.py
@@ -75,26 +75,22 @@ def test_NOMunicipalitySelect(self):
         with override('en'):
             f = NOMunicipalitySelect()
             out = '''<select name="municipalities">
-    <option value="akershus" selected="selected">Akershus</option>
-    <option value="austagder">Aust-Agder</option>
+    <option value="agder" selected="selected">Agder</option>
+    <option value="akershus">Akershus</option>
     <option value="buskerud">Buskerud</option>
     <option value="finnmark">Finnmark</option>
-    <option value="hedmark">Hedmark</option>
-    <option value="hordaland">Hordaland</option>
+    <option value="innlandet">Innlandet</option>
     <option value="janmayen">Jan Mayen</option>
     <option value="moreogromsdal">Møre og Romsdal</option>
-    <option value="nordtrondelag">Nord-Trøndelag</option>
     <option value="nordland">Nordland</option>
-    <option value="oppland">Oppland</option>
     <option value="oslo">Oslo</option>
+    <option value="ostfold">Østfold</option>
     <option value="rogaland">Rogaland</option>
-    <option value="sognogfjordane">Sogn og Fjordane</option>
     <option value="svalbard">Svalbard</option>
-    <option value="sortrondelag">Sør-Trøndelag</option>
     <option value="telemark">Telemark</option>
     <option value="troms">Troms</option>
-    <option value="vestagder">Vest-Agder</option>
+    <option value="trondelag">Trøndelag</option>
     <option value="vestfold">Vestfold</option>
-    <option value="ostfold">Østfold</option>
+    <option value="vestland">Vestland</option>
 </select>'''
-        self.assertHTMLEqual(f.render('municipalities', 'akershus'), out)
+        self.assertHTMLEqual(f.render('municipalities', 'agder'), out)