diff --git a/src/Slugify.php b/src/Slugify.php
index 48e69ae1..87954895 100644
--- a/src/Slugify.php
+++ b/src/Slugify.php
@@ -57,7 +57,7 @@ class Slugify implements SlugifyInterface
         'Á' => 'A',
         'Â' => 'A',
         'Ã' => 'A',
-        'Å' => 'A',
+        'Å' => 'AA',
         'Ǻ' => 'A',
         'Ă' => 'A',
         'Ǎ' => 'A',
@@ -67,7 +67,7 @@ class Slugify implements SlugifyInterface
         'á' => 'a',
         'â' => 'a',
         'ã' => 'a',
-        'å' => 'a',
+        'å' => 'aa',
         'ǻ' => 'a',
         'ă' => 'a',
         'ǎ' => 'a',
@@ -140,7 +140,7 @@ class Slugify implements SlugifyInterface
         'Ǒ' => 'O',
         'Ő' => 'O',
         'Ơ' => 'O',
-        'Ø' => 'O',
+        'Ø' => 'OE',
         'Ǿ' => 'O',
         'Œ' => 'OE',
         'ò' => 'o',
@@ -151,7 +151,7 @@ class Slugify implements SlugifyInterface
         'ǒ' => 'o',
         'ő' => 'o',
         'ơ' => 'o',
-        'ø' => 'o',
+        'ø' => 'oe',
         'ǿ' => 'o',
         'º' => 'o',
         'œ' => 'oe',
diff --git a/tests/SlugifyTest.php b/tests/SlugifyTest.php
index 50487370..0a376538 100644
--- a/tests/SlugifyTest.php
+++ b/tests/SlugifyTest.php
@@ -198,7 +198,7 @@ public function provider()
             array('Â â Ê ê Ô ô Û û', 'a-a-e-e-o-o-u-u'),
             array('Â â Ê ê Ô ô Û 1', 'a-a-e-e-o-o-u-1'),
             array('°¹²³⁴⁵⁶⁷⁸⁹@₀₁₂₃₄₅₆₇₈₉', '0123456789at0123456789'),
-            array('Mórë thån wørds', 'more-than-words'),
+            array('Mórë thån wørds', 'more-thaan-woerds'),
             array('Блоґ їжачка', 'blog-jizhachka'),
             array('фильм', 'film'),
             array('драма', 'drama'),