diff --git a/telegram-adium/TelegramPlugin.m b/telegram-adium/TelegramPlugin.m
index b4332d0..4af4882 100644
--- a/telegram-adium/TelegramPlugin.m
+++ b/telegram-adium/TelegramPlugin.m
@@ -20,6 +20,8 @@
 #  include "config.h"
 #endif
 
+#include "commit.h"
+
 #import "TelegramPlugin.h"
 #import "TelegramService.h"
 #import "telegram-purple.h"
@@ -49,17 +51,17 @@ extern void purple_init_telegram_plugin();
 
 - (NSString *)pluginAuthor
 {
-    return @TG_AUTHOR;
+    return @PLUGIN_AUTHOR;
 }
 
 -(NSString *)pluginVersion
 {
-    return @PACKAGE_VERSION;
+    return @PACKAGE_VERSION "\n\t\t\tcommit: " GIT_COMMIT "\n\t\t\tlibtgl: " TGL_VERSION;
 }
 
 -(NSString *)pluginDescription
 {
-    return @TG_DESCRIPTION;
+    return @"Telegram Protocol Plugin";
 }
 
 -(char*)getPkName
diff --git a/telegram-purple.c b/telegram-purple.c
index b325646..98440d5 100644
--- a/telegram-purple.c
+++ b/telegram-purple.c
@@ -862,10 +862,10 @@ static PurplePluginInfo plugin_info = {
   PURPLE_PRIORITY_DEFAULT,
   PLUGIN_ID,
   "Telegram",
-  PACKAGE_VERSION " libtgl: " TGL_VERSION,
+  PACKAGE_VERSION "\n\t\t\tcommit: " GIT_COMMIT "\n\t\t\tlibtgl: " TGL_VERSION,
   "Telegram",
-  TG_DESCRIPTION,
-  TG_AUTHOR,
+  N_("Telegram Protocol Plugin."),
+  PLUGIN_AUTHOR,
   "https://github.com/majn/telegram-purple",
   NULL,           // on load
   NULL,           // on unload
diff --git a/telegram-purple.h b/telegram-purple.h
index 4762554..d57da12 100644
--- a/telegram-purple.h
+++ b/telegram-purple.h
@@ -58,11 +58,8 @@
 #include "msglog.h"
 
 #define PLUGIN_ID "prpl-telegram"
-// FIXME: Name must be translated (for languages without latin script, it would look like gibberish. Just like Japanese script looks to me.)
-#define TG_AUTHOR "Matthias Jentsch <mtthsjntsch@gmail.com>, Vitaly Valtman, Ben Wiederhake, Christopher Althaus <althaus.christopher@gmail.com>, Based on libtgl by Vitaly Valtman."
-#define TG_DESCRIPTION "Telegram protocol."
-#define TG_BUILD "13"
-  
+#define PLUGIN_AUTHOR "Matthias Jentsch <mtthsjntsch@gmail.com>\n\t\t\tVitaly Valtman\n\t\t\tBen Wiederhake\n\t\t\tChristopher Althaus <althaus.christopher@gmail.com>"
+
 #define TGP_APP_HASH "99428c722d0ed59b9cd844e4577cb4bb"
 #define TGP_APP_ID 16154