diff --git a/bundles/org.jkiss.dbeaver.ext.sample.database.nls/OSGI-INF/l10n/bundle_ru.properties b/bundles/org.jkiss.dbeaver.ext.sample.database.nls/OSGI-INF/l10n/bundle_ru.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a94943670fed7cf34af0c67974775b282a596021
--- /dev/null
+++ b/bundles/org.jkiss.dbeaver.ext.sample.database.nls/OSGI-INF/l10n/bundle_ru.properties
@@ -0,0 +1,3 @@
+#Properties file for org.jkiss.dbeaver.ext.sample.database
+Bundle-Vendor = JKISS
+Bundle-Name = DBeaver Sample Database
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
index 09b8e4c9e215de8c184179111292c7b70c7de525..f43a3b6807d952f47480cd050455fc61232a5c51 100644
--- a/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: Sample Database Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jkiss.dbeaver.ext.sample.database;singleton:=true
 Bundle-Version: 1.0.5
 Bundle-Release-Date: 20171030
@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.ui,
  org.jkiss.dbeaver.ext.sqlite
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: JKISS
+Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.jkiss.dbeaver.ext.sample.database
diff --git a/plugins/org.jkiss.dbeaver.ext.sample.database/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.sample.database/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000000000000000000000000000000000..a94943670fed7cf34af0c67974775b282a596021
--- /dev/null
+++ b/plugins/org.jkiss.dbeaver.ext.sample.database/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.jkiss.dbeaver.ext.sample.database
+Bundle-Vendor = JKISS
+Bundle-Name = DBeaver Sample Database
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.ext.sample.database/build.properties b/plugins/org.jkiss.dbeaver.ext.sample.database/build.properties
index 971cc57c422afcaefacaa6ca1f8573ac808e2cc0..07312f7df423ce6aeceaf59b4c12a80d599e8e34 100644
--- a/plugins/org.jkiss.dbeaver.ext.sample.database/build.properties
+++ b/plugins/org.jkiss.dbeaver.ext.sample.database/build.properties
@@ -1,7 +1,8 @@
 source.. = src/
 output.. = bin/
-bin.includes = plugin.xml,\
+bin.includes = .,\
                META-INF/,\
-               .,\
-               icons,\
-               data/
+               OSGI-INF/,\
+               data/,\
+               icons/,\
+               plugin.xml