1 files changed, 8 insertions, 2 deletions
diff --git a/languages/classes/LanguageFi.php b/languages/classes/LanguageFi.php
index 8fc25499..d7363969 100644
--- a/languages/classes/LanguageFi.php
+++ b/languages/classes/LanguageFi.php
@@ -1,8 +1,7 @@
 <?php
 /** Finnish (Suomi)
  *
- * @package MediaWiki
- * @subpackage Language
+ * @addtogroup Language
  *
  * @author Niklas Laxström
  */
@@ -32,6 +31,13 @@ class LanguageFi extends Language {
 		# wovel harmony flag
 		$aou = preg_match( '/[aou][^äöy]*$/i', $word );
 
+		# The flag should be false for compounds where the last word has only neutral vowels (e/i).
+		# The general case cannot be handled without a dictionary, but there's at least one notable
+		# special case we should check for:
+
+		if ( preg_match( '/wiki$/i', $word ) )
+			$aou = false;
+
 		# append i after final consonant
 		if ( preg_match( '/[bcdfghjklmnpqrstvwxz]$/i', $word ) )
 			$word .= 'i';