diff --git a/macxconf.pri b/macxconf.pri
index c57495d42..273b122f4 100644
--- a/macxconf.pri
+++ b/macxconf.pri
@@ -16,16 +16,50 @@ LIBS += -lssl -lcrypto
 # Boost system lib
 LIBS += -lboost_system-mt
 # Boost filesystem lib (Not needed for libtorrent >= 0.16.0)
-LIBS += -lboost_filesystem-mt
+#LIBS += -lboost_filesystem-mt
 # Carbon
 LIBS += -framework Carbon -framework IOKit
 
 document_icon.path = Contents/Resources
-document_icon.files = Icons/qBitTorrentDocument.icns
-
+document_icon.files = mac/qBitTorrentDocument.icns
 QMAKE_BUNDLE_DATA += document_icon
-ICON = Icons/qbittorrent_mac.icns
-QMAKE_INFO_PLIST = Info.plist
+
+qt_conf.path = Contents/Resources
+qt_conf.files = mac/qt.conf
+QMAKE_BUNDLE_DATA += qt_conf
+
+qt_translations.path = Contents/MacOS/translations
+qt_translations.files = qt-translations/qt_ar.qm \
+                        qt-translations/qt_bg.qm \
+                        qt-translations/qt_ca.qm \
+                        qt-translations/qt_cs.qm \
+                        qt-translations/qt_da.qm \
+                        qt-translations/qt_de.qm \
+                        qt-translations/qt_es.qm \
+                        qt-translations/qt_fi.qm \
+                        qt-translations/qt_fr.qm \
+                        qt-translations/qt_gl.qm \
+                        qt-translations/qt_he.qm \
+                        qt-translations/qt_hu.qm \
+                        qt-translations/qt_it.qm \
+                        qt-translations/qt_ja.qm \
+                        qt-translations/qt_ko.qm \
+                        qt-translations/qt_lt.qm \
+                        qt-translations/qt_nl.qm \
+                        qt-translations/qt_pl.qm \
+                        qt-translations/qt_pt.qm \
+                        qt-translations/qt_pt_BR.qm \
+                        qt-translations/qt_ru.qm \
+                        qt-translations/qt_sk.qm \
+                        qt-translations/qt_sv.qm \
+                        qt-translations/qt_tr.qm \
+                        qt-translations/qt_uk.qm \
+                        qt-translations/qt_zh_CN.qm \
+                        qt-translations/qt_zh_TW.qm
+QMAKE_BUNDLE_DATA += qt_translations
+
+ICON = mac/qbittorrent_mac.icns
+QMAKE_INFO_PLIST = mac/Info.plist
 
 DEFINES += WITH_GEOIP_EMBEDDED
 message("On Mac OS X, GeoIP database must be embedded.")
diff --git a/src/Info.plist b/src/mac/Info.plist
similarity index 100%
rename from src/Info.plist
rename to src/mac/Info.plist
diff --git a/src/Icons/qBitTorrentDocument.icns b/src/mac/qBitTorrentDocument.icns
similarity index 100%
rename from src/Icons/qBitTorrentDocument.icns
rename to src/mac/qBitTorrentDocument.icns
diff --git a/src/Icons/qbittorrent_mac.icns b/src/mac/qbittorrent_mac.icns
similarity index 100%
rename from src/Icons/qbittorrent_mac.icns
rename to src/mac/qbittorrent_mac.icns
diff --git a/src/mac/qt.conf b/src/mac/qt.conf
new file mode 100644
index 000000000..47e7d450f
--- /dev/null
+++ b/src/mac/qt.conf
@@ -0,0 +1,4 @@
+[Paths]
+ Prefix = MacOS
+ Translations = translations
+ Plugins = PlugIns
diff --git a/src/qt-translations/qt_ar.qm b/src/qt-translations/qt_ar.qm
new file mode 100644
index 000000000..e524d5b77
Binary files /dev/null and b/src/qt-translations/qt_ar.qm differ
diff --git a/src/qt-translations/qt_bg.qm b/src/qt-translations/qt_bg.qm
new file mode 100644
index 000000000..2cab8a1bf
Binary files /dev/null and b/src/qt-translations/qt_bg.qm differ
diff --git a/src/qt-translations/qt_ca.qm b/src/qt-translations/qt_ca.qm
new file mode 100644
index 000000000..097360310
Binary files /dev/null and b/src/qt-translations/qt_ca.qm differ
diff --git a/src/qt-translations/qt_cs.qm b/src/qt-translations/qt_cs.qm
new file mode 100644
index 000000000..7918e0009
Binary files /dev/null and b/src/qt-translations/qt_cs.qm differ
diff --git a/src/qt-translations/qt_da.qm b/src/qt-translations/qt_da.qm
new file mode 100644
index 000000000..1e7dda628
Binary files /dev/null and b/src/qt-translations/qt_da.qm differ
diff --git a/src/qt-translations/qt_de.qm b/src/qt-translations/qt_de.qm
new file mode 100644
index 000000000..113bbcc39
Binary files /dev/null and b/src/qt-translations/qt_de.qm differ
diff --git a/src/qt-translations/qt_es.qm b/src/qt-translations/qt_es.qm
new file mode 100644
index 000000000..519116090
Binary files /dev/null and b/src/qt-translations/qt_es.qm differ
diff --git a/src/qt-translations/qt_fi.qm b/src/qt-translations/qt_fi.qm
new file mode 100644
index 000000000..dc70e8a07
Binary files /dev/null and b/src/qt-translations/qt_fi.qm differ
diff --git a/src/qt-translations/qt_fr.qm b/src/qt-translations/qt_fr.qm
new file mode 100644
index 000000000..a3e8eaf32
Binary files /dev/null and b/src/qt-translations/qt_fr.qm differ
diff --git a/src/qt-translations/qt_gl.qm b/src/qt-translations/qt_gl.qm
new file mode 100644
index 000000000..bbc92ce12
Binary files /dev/null and b/src/qt-translations/qt_gl.qm differ
diff --git a/src/qt-translations/qt_he.qm b/src/qt-translations/qt_he.qm
new file mode 100644
index 000000000..4ff507e07
Binary files /dev/null and b/src/qt-translations/qt_he.qm differ
diff --git a/src/qt-translations/qt_hu.qm b/src/qt-translations/qt_hu.qm
new file mode 100644
index 000000000..4f2936444
Binary files /dev/null and b/src/qt-translations/qt_hu.qm differ
diff --git a/src/qt-translations/qt_it.qm b/src/qt-translations/qt_it.qm
new file mode 100644
index 000000000..1e69f88fd
Binary files /dev/null and b/src/qt-translations/qt_it.qm differ
diff --git a/src/qt-translations/qt_ja.qm b/src/qt-translations/qt_ja.qm
new file mode 100644
index 000000000..26280da94
Binary files /dev/null and b/src/qt-translations/qt_ja.qm differ
diff --git a/src/qt-translations/qt_ko.qm b/src/qt-translations/qt_ko.qm
new file mode 100644
index 000000000..7377e75e5
Binary files /dev/null and b/src/qt-translations/qt_ko.qm differ
diff --git a/src/qt-translations/qt_lt.qm b/src/qt-translations/qt_lt.qm
new file mode 100644
index 000000000..834185478
Binary files /dev/null and b/src/qt-translations/qt_lt.qm differ
diff --git a/src/qt-translations/qt_nl.qm b/src/qt-translations/qt_nl.qm
new file mode 100644
index 000000000..ce9f56f47
Binary files /dev/null and b/src/qt-translations/qt_nl.qm differ
diff --git a/src/qt-translations/qt_pl.qm b/src/qt-translations/qt_pl.qm
new file mode 100644
index 000000000..a5952f8f8
Binary files /dev/null and b/src/qt-translations/qt_pl.qm differ
diff --git a/src/qt-translations/qt_pt.qm b/src/qt-translations/qt_pt.qm
new file mode 100644
index 000000000..a5ef590ec
Binary files /dev/null and b/src/qt-translations/qt_pt.qm differ
diff --git a/src/qt-translations/qt_pt_BR.qm b/src/qt-translations/qt_pt_BR.qm
new file mode 100644
index 000000000..4bafaad2e
Binary files /dev/null and b/src/qt-translations/qt_pt_BR.qm differ
diff --git a/src/qt-translations/qt_ru.qm b/src/qt-translations/qt_ru.qm
new file mode 100644
index 000000000..ea05b5797
Binary files /dev/null and b/src/qt-translations/qt_ru.qm differ
diff --git a/src/qt-translations/qt_sk.qm b/src/qt-translations/qt_sk.qm
new file mode 100644
index 000000000..3895a95da
Binary files /dev/null and b/src/qt-translations/qt_sk.qm differ
diff --git a/src/qt-translations/qt_sv.qm b/src/qt-translations/qt_sv.qm
new file mode 100644
index 000000000..62866610a
Binary files /dev/null and b/src/qt-translations/qt_sv.qm differ
diff --git a/src/qt-translations/qt_tr.qm b/src/qt-translations/qt_tr.qm
new file mode 100644
index 000000000..b0d14e9ff
Binary files /dev/null and b/src/qt-translations/qt_tr.qm differ
diff --git a/src/qt-translations/qt_uk.qm b/src/qt-translations/qt_uk.qm
new file mode 100644
index 000000000..af84e9814
Binary files /dev/null and b/src/qt-translations/qt_uk.qm differ
diff --git a/src/qt-translations/qt_zh_CN.qm b/src/qt-translations/qt_zh_CN.qm
new file mode 100644
index 000000000..b8c02c2b8
Binary files /dev/null and b/src/qt-translations/qt_zh_CN.qm differ
diff --git a/src/qt-translations/qt_zh_TW.qm b/src/qt-translations/qt_zh_TW.qm
new file mode 100644
index 000000000..c5fa104a1
Binary files /dev/null and b/src/qt-translations/qt_zh_TW.qm differ