diff --git a/net-im/telegram/Manifest b/net-im/telegram/Manifest
index 5d762ba3..66e9a7ce 100644
--- a/net-im/telegram/Manifest
+++ b/net-im/telegram/Manifest
@@ -1 +1,3 @@
-DIST tsetup.1.2.1.tar.xz 33084716 SHA256 1adc9e60afc0a429765c3c454c297b3b42fc6fd8fe2d6eb61dfb76bb72b6765a SHA512 179408ac2df8ce4f90dac0f8bef70b0a2fce33d665bf0de3280b2743e874103814536d5ab53be2b1b49fe7aebbe202d04b2b98713e8183c950659af9372880c7 WHIRLPOOL 774a9907d467c632d8f2b183b80e5ef447c87386bd8a5f09e3d35c0f60410793cc2e8f152626daa70a799681cec1d8661c9cdac4cb88cec7fb41bf39aa20bb4a
+DIST tdesktop-1.2.15.tar.gz 16916025 SHA256 a37009f81cb305d69e38b55019fff3b095761689706e83a5aa0ecf5b098c51f6 SHA512 9b73a7029790feaed2b044df81251bf3c09e7ce3485669cbb9dd304b7adca29c29991e1d3f8e40873e0e6200ed47b27a4cacaee2c4f6bad407d86650ed642f77 WHIRLPOOL a3cb843243016f87069a77189eb222b4a574907fc1de344fff300d8a2b6f17e853eb8bcdd1e9ec6df8269a7aaeb74a0eff074865922e88d447e4e0bc7e23576e
+DIST tsetup.1.2.15.tar.xz 33391864 SHA256 53de29383dc8db49c1194b0eac83d6cacfee7907290eadbb897bc09150f4ca2f SHA512 d13649cf52702f2abcfb62bdb2ea8000f6087f26dd8ecb2f4663cb609b50095c9f36bdf0aac2ddef39824a9d4c7ca637448ea4749cc709c40d5af736f18d20cb WHIRLPOOL a3038a7c724aa1e70309673a18bb00bd82b0c67e68cd5ca71b4af0ea0cbb8ab7b21300e01d769e813a9510e03991932f5c69424e67a0a42cf963f6b2187e1da8
+DIST tsetup32.1.2.15.tar.xz 35562536 SHA256 12b0f008b4b057163b687a06721c34567b8eb26643dd44c011f9e31bda475636 SHA512 7000489a8ccef45b226858af707cb167dff346e10e33f0ecf745c0b26eae8cb7df9d5bf1604eda5865611aae324b5da6f7b1975371257dec34065cd2e3399833 WHIRLPOOL 1b7369d7bbcfd566b9d5e8eb0e7f57d7c5d447c2aa400b10360006f42be14440b6712e7fb2439a78b44a9c2522ed304e46f6faaaf82a2769309b881a385d172e
diff --git a/net-im/telegram/telegram-1.2.1.ebuild b/net-im/telegram/telegram-1.2.1.ebuild
deleted file mode 100644
index 9b726e79..00000000
--- a/net-im/telegram/telegram-1.2.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-DESCRIPTION="Telegram is a messaging app with a focus on speed and security, it’s super fast, simple and free. You can use Telegram on all your devices at the same time — your messages sync seamlessly across any of your phones, tablets or computers."
-HOMEPAGE="https://telegram.org/"
-SRC_URI="https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz"
-
-inherit user
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-
-S="${WORKDIR}/Telegram"
-
-src_install() {
-    dobin Telegram
-}
diff --git a/net-im/telegram/telegram-1.2.15.ebuild b/net-im/telegram/telegram-1.2.15.ebuild
new file mode 100644
index 00000000..2de83b92
--- /dev/null
+++ b/net-im/telegram/telegram-1.2.15.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils gnome2-utils xdg
+
+DESCRIPTION="Official desktop client for Telegram (binary package)"
+HOMEPAGE="https://desktop.telegram.org"
+SRC_URI="
+	https://github.com/telegramdesktop/tdesktop/archive/v${PV}.tar.gz -> tdesktop-${PV}.tar.gz
+	amd64? ( https://updates.tdesktop.com/tlinux/tsetup.${PV}.tar.xz )
+	x86? ( https://updates.tdesktop.com/tlinux32/tsetup32.${PV}.tar.xz )
+"
+
+LICENSE="telegram"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+QA_PREBUILT="usr/bin/telegram-desktop"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/gobject-introspection
+	>=sys-apps/dbus-1.4.20
+	x11-libs/libX11
+	>=x11-libs/libxcb-1.10[xkb]
+"
+DEPEND=""
+
+S="${WORKDIR}/Telegram"
+
+src_install() {
+	newbin "${S}/Telegram" telegram-desktop
+
+	local icon_size
+	for icon_size in 16 32 48 64 128 256 512; do
+		newicon -s "${icon_size}" \
+			"${WORKDIR}/tdesktop-${PV}/Telegram/Resources/art/icon${icon_size}.png" \
+			telegram-desktop.png
+	done
+
+	domenu "${WORKDIR}/tdesktop-${PV}"/lib/xdg/telegramdesktop.desktop
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}