diff --git a/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
index d254e2863f4643f69e1876bda41f0d6bb8602011..7ac8b281fcd4a54f20cfbb63767502a909554560 100644
--- a/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: DBeaver Debug Core
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jkiss.dbeaver.debug.core
 Bundle-Version: 1.0.0
-Bundle-Vendor: JKISS
+Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.jkiss.dbeaver.debug.core/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.debug.core/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000000000000000000000000000000000..87f9e9a54510445b0acc65e5a4bb7f45d8b25196
--- /dev/null
+++ b/plugins/org.jkiss.dbeaver.debug.core/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.jkiss.dbeaver.debug.core
+Bundle-Vendor = JKISS
+Bundle-Name = DBeaver Debug Core
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.debug.core/build.properties b/plugins/org.jkiss.dbeaver.debug.core/build.properties
index 56d776555503f2905e0642aae5be7938371a965d..67e6565494e9b9a38f3a24b6a89447a31c62e91c 100644
--- a/plugins/org.jkiss.dbeaver.debug.core/build.properties
+++ b/plugins/org.jkiss.dbeaver.debug.core/build.properties
@@ -1,4 +1,5 @@
 source.. = src/
 output.. = target/classes/
 bin.includes = META-INF/,\
-               .
+               .,\
+               OSGI-INF/