diff --git a/Changelog b/Changelog
index 827c45127..745bdfd17 100644
--- a/Changelog
+++ b/Changelog
@@ -1,6 +1,7 @@
 * Unknown - Christophe Dumez <chris@qbittorrent.org> - v0.8.0
     - FEATURE: Based on Qt 4.2
     - FEATURE: Brand new trayicon from Qt 4.2
+    - I18N: Added Finnish translation
     - COSMETIC: Replaced OSD messages by systray messages
 
 * Mon Oct 16 2006 - Christophe Dumez <chris@qbittorrent.org> - v0.7.1
diff --git a/src/Icons/flags/finland.png b/src/Icons/flags/finland.png
new file mode 100644
index 000000000..818f5d415
Binary files /dev/null and b/src/Icons/flags/finland.png differ
diff --git a/src/icons.qrc b/src/icons.qrc
index 1fde2cd3e..89e9ed9a6 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -39,6 +39,7 @@
   <file>Icons/flags/romania.png</file>
   <file>Icons/flags/bulgaria.png</file>
   <file>Icons/flags/greece.png</file>
+  <file>Icons/flags/finland.png</file>
   <file>Icons/skin/properties.png</file>
   <file>Icons/skin/play_all.png</file>
   <file>Icons/skin/remove.png</file>
diff --git a/src/lang.qrc b/src/lang.qrc
index caafc5c9e..139a0a13a 100644
--- a/src/lang.qrc
+++ b/src/lang.qrc
@@ -21,5 +21,6 @@
   <file>lang/qbittorrent_de.qm</file>
   <file>lang/qbittorrent_zh_HK.qm</file>
   <file>lang/qbittorrent_nb.qm</file>
+  <file>lang/qbittorrent_fi.qm</file>
 </qresource>
 </RCC>
\ No newline at end of file
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index 5fd89b40e..70a7586d8 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -72,6 +72,8 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){
   locales << "el_GR";
   combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/sweden.png"))), QString::fromUtf8("Svenska"));
   locales << "sv_SE";
+  combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/finland.png"))), QString::fromUtf8("Suomi"));
+  locales << "fi_FI";
   combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/norway.png"))), QString::fromUtf8("Norsk"));
   locales << "nb_NO";
   combo_i18n->addItem((QIcon(QString::fromUtf8(":/Icons/flags/bulgaria.png"))), QString::fromUtf8("Български"));
diff --git a/src/src.pro b/src/src.pro
index eae33c9bd..062ef6cbd 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -90,7 +90,8 @@ TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \
 	       $$LANG_PATH/qbittorrent_sk.ts \
                $$LANG_PATH/qbittorrent_ro.ts \
                $$LANG_PATH/qbittorrent_pt.ts \
-	       $$LANG_PATH/qbittorrent_nb.ts
+	       $$LANG_PATH/qbittorrent_nb.ts \
+	       $$LANG_PATH/qbittorrent_fi.ts
 
 # Source code
 HEADERS += GUI.h misc.h options_imp.h about_imp.h \