diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88009758..f673388d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
 Changelog for Redmine DMSF
 ==========================
 
+1.5.7 *2015-??-??*
+------------------
+
 1.5.6 *2015-01-25*
 ------------------
 
diff --git a/README.md b/README.md
index 4afc77ba..0250c684 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Redmine DMSF Plugin
 ===================
 
-The current version of Redmine DMSF is **1.5.6** [![Build Status](https://api.travis-ci.org/danmunn/redmine_dmsf.png)](https://travis-ci.org/danmunn/redmine_dmsf)
+The current version of Redmine DMSF is **1.5.7** [![Build Status](https://api.travis-ci.org/danmunn/redmine_dmsf.png)](https://travis-ci.org/danmunn/redmine_dmsf)
 
 Redmine DMSF is Document Management System Features plugin for Redmine issue tracking system; It is aimed to replace current Redmine's Documents module.
 
diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index c8d5e909..b0a87409 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -3,7 +3,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
-# Copyright (C) 2011-15 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011-16 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -256,7 +256,8 @@ class DmsfFileRevision < ActiveRecord::Base
     else
       filename = self.name
     end    
-    format.sub!('%t', filename)
+    format.sub!('%t', self.title)
+    format.sub!('%f', filename)
     format.sub!('%d', self.updated_at.strftime('%Y%m%d%H%M%S'))
     format.sub!('%v', self.version)
     format.sub!('%i', self.file.id.to_s)
@@ -264,4 +265,4 @@ class DmsfFileRevision < ActiveRecord::Base
     format + ext
   end
 
-end
+end
\ No newline at end of file
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5b2017c3..d61abdbe 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -109,7 +109,7 @@ cs:
   select_option_deactivated: Deaktivováno
   select_option_activated: Aktivováno
   label_title_format: Formát názvu
-  text_title_format: "Formát názvu souboru pro stažení (%t - název, %d - datum, %v - verze, %i - ID, %r - revize). Např.: %t_%v"
+  text_title_format: "Formát názvu souboru pro stažení (%t - název, %f - soubor, %d - datum, %v - verze, %i - ID, %r - revize). Např.: %t_%v"
   title_save_preferences: Uložit nastavení
   heading_revisions: Revize
   title_download: Stáhnout
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8463641b..3fff02ee 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -109,7 +109,7 @@ de:
   select_option_deactivated: Aus
   select_option_activated: Ein
   label_title_format: Title format
-  text_title_format: "Format des Dokumente-Titels für Speichern (%t - Titel, %d - Datum, %v - Version, %i - ID, %r - Revision). z.B.: %t_%v"
+  text_title_format: "Format des Dokumente-Titels für Speichern (%t - Titel, %f - Datei, %d - Datum, %v - Version, %i - ID, %r - Revision). z.B.: %t_%v"
   title_save_preferences: Einstellungen speichern
   heading_revisions: Versionen
   title_download: Download
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fa7fde8d..836637bf 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -109,7 +109,7 @@ en:
   select_option_deactivated: Deactivated
   select_option_activated: Activated
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Save preferences
   heading_revisions: Revisions
   title_download: Download
diff --git a/config/locales/es.yml b/config/locales/es.yml
index cab4c704..8be42f4f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -109,7 +109,7 @@ es:
   select_option_deactivated: Desactivado
   select_option_activated: Activado
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Guardar Preferencias
   heading_revisions: Revisiones
   title_download: Descargar
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 6102f966..87f4a50d 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -109,7 +109,7 @@ fr:
   select_option_deactivated: Désactivé
   select_option_activated: Activé
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Enregistrer les préférences
   heading_revisions: Révisions
   title_download: Télécharger
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8d15c24d..35ff8e62 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -109,7 +109,7 @@ ja:
   select_option_deactivated: 無効
   select_option_activated: 有効
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: 設定を保存します
   heading_revisions: リビジョン
   title_download: ダウンロードします
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e2d6c5e4..0e94fc16 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -109,7 +109,7 @@ pl:
   select_option_default: Domyślny
   select_option_deactivated: Wyłączono
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   select_option_activated: Aktywowano
   title_save_preferences: Zapisz ustawienia
   heading_revisions: Wersje
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c282ebee..11acc558 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -109,7 +109,7 @@ pt-BR:
   select_option_deactivated: Desativado
   select_option_activated: Ativado
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Salvar preferências
   heading_revisions: Revisões
   title_download: Download
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d884ecd4..6f661767 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -109,7 +109,7 @@ ru:
   select_option_deactivated: Отключено
   select_option_activated: Включено
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Сохранить настройки
   heading_revisions: Редакции
   title_download: Скачать
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index b29b5583..9b02cf00 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -109,7 +109,7 @@ sl:
   select_option_deactivated: Deaktivirano
   select_option_activated: Aktivirano
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: Save preferences
   heading_revisions: Verzije
   title_download: Prenesi dol
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d15c5227..04333d55 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -109,7 +109,7 @@ zh-TW:
   select_option_deactivated: 關閉
   select_option_activated: 啟用
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   title_save_preferences: 儲存偏好設定
   heading_revisions: 修訂版本
   title_download: 下載
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 65a18212..508ed8d8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -110,7 +110,7 @@ zh:
   select_option_activated: 激活
   title_save_preferences: 保存偏好设定
   label_title_format: Title format
-  text_title_format: "Document title format for download (%t - title, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
+  text_title_format: "Document title format for download (%t - title, %f - file, %d - date, %v - version, %i - ID, %r - revision). Example: %t_%v"
   heading_revisions: 修订版本
   title_download: 下载
   title_delete_revision: 删除此修订
diff --git a/init.rb b/init.rb
index 473db794..5cdd5cf7 100644
--- a/init.rb
+++ b/init.rb
@@ -28,7 +28,7 @@ Redmine::Plugin.register :redmine_dmsf do
   name 'DMSF'
   author 'Vít Jonáš / Daniel Munn / Karel Pičman'
   description 'Document Management System Features'
-  version '1.5.6'
+  version '1.5.7 devel'
   url 'http://www.redmine.org/plugins/dmsf'
   author_url 'https://github.com/danmunn/redmine_dmsf/graphs/contributors'