diff --git a/resources/dictionaries/nb/post_office.txt b/resources/dictionaries/nb/post_office.txt
index 16f95eaf3..026a552fb 100644
--- a/resources/dictionaries/nb/post_office.txt
+++ b/resources/dictionaries/nb/post_office.txt
@@ -1 +1,3 @@
-postboks
\ No newline at end of file
+postboks
+boks
+pb
diff --git a/resources/dictionaries/nb/street_names.txt b/resources/dictionaries/nb/street_names.txt
new file mode 100644
index 000000000..fbff172fd
--- /dev/null
+++ b/resources/dictionaries/nb/street_names.txt
@@ -0,0 +1,30 @@
+bukt
+bukta
+dal
+dalen
+fjell
+fjellet
+hamn
+hamna
+havn
+havna
+kai
+kaia
+kaien
+li
+lia
+lien
+park
+parken
+skau
+skauen
+skog
+skogen
+stor
+tjern
+tjernet
+vann
+vannet
+vatn
+vik
+vika
diff --git a/resources/dictionaries/nb/street_types.txt b/resources/dictionaries/nb/street_types.txt
index dd8e2a8cf..95a4e9259 100644
--- a/resources/dictionaries/nb/street_types.txt
+++ b/resources/dictionaries/nb/street_types.txt
@@ -1,19 +1,29 @@
-allè|alle
-allèen|alleen
+allé|alle
+alléen|alleen|allen
 bakken
-bukt
-byen
-dalen
-flate
+faret
 gata|g|gt
 gate|g|gt
-gaten
-lia
-park
+gaten|g|gt
+gutu|g|gt
+gutua|g|gt
+kroken
+plass|pl
 plassen|pl
-stortorget
+smau
+smauet
+smug
+smuget
+sti
+stien
 stredet
+stubben
 svingen
+terasse|terrasse
+terassen|terrassen
+torg
+torget
+tråkket
 veg|v
 vegen|v|vn
 vei|v