diff --git a/app-misc/itmages-service/Manifest b/app-misc/itmages-service/Manifest
index ea4f70c..1ba188b 100644
--- a/app-misc/itmages-service/Manifest
+++ b/app-misc/itmages-service/Manifest
@@ -1,2 +1,2 @@
-EBUILD itmages-service-9999.ebuild 487 RMD160 6c847961cc5ba98b4b08b4afe924e881ccf9fb6a SHA1 2be34fd7bc47c0119c4bc251752c0f5e0bfdeff0 SHA256 3cb6d6b23c6c810e58a7524c9aac09347129eba032a90c757ade9d01288391b6
-MISC metadata.xml 227 RMD160 2347f59df0b59983caee9c352404e2abfc402966 SHA1 0c2ade9ad300f4223bd8ed6ee953df45070a4dc5 SHA256 6cabc0781008593c3951ed8500cd4b8901d747703b15c2076c83fccc7aae6262
+EBUILD itmages-service-9999.ebuild 733 SHA256 5947255ca908ef23253ed3ca4d17d00b0fea8d3183a849264ebab2f36b6dcfee SHA512 bbcf08e9092774dc36730603eacb2c18c464f29b688c38701402ba3aeb2cee8e9c9496dcd0aebf999ea54dd45e5eee5a1ccc779fea2c6334068731734dad7ed8 WHIRLPOOL 3f9293ed3442ac3dbaf7d6ee75452530cc53393d42a4c00d1eb9c394d427c3a47c0aabafca05f8ec71ce5a48c0b05ea7b426d6ef3423b3ca1a57f20417cc98ef
+MISC metadata.xml 227 SHA256 6cabc0781008593c3951ed8500cd4b8901d747703b15c2076c83fccc7aae6262 SHA512 d726be969ca438d2976462f3aa0a302ffae92c16573348c87832b74e76fc4c9b203a9fd72f03bd44ed8a5fe6fbdccb4ac060f8ffba35675dcf2ec78cdf9cab7d WHIRLPOOL 07d079824766360345943688a0c192eaf9069358201ceada39286e400dcd9f0c909dce5a08ca10fc91facadba34407d3837b952afff41719c65ea311a89b6d6e
diff --git a/app-misc/itmages-service/itmages-service-9999.ebuild b/app-misc/itmages-service/itmages-service-9999.ebuild
index 81d9068..c34d036 100644
--- a/app-misc/itmages-service/itmages-service-9999.ebuild
+++ b/app-misc/itmages-service/itmages-service-9999.ebuild
@@ -2,22 +2,27 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI="5"
 
-PYTHON_DEPEND="2"
-
-inherit git-2 distutils
+PYTHON_COMPAT=( python2_7 )
+EGIT_REPO_URI="git://github.com/itmages/itmages-service.git"
+inherit distutils-r1 git-r3
 
 DESCRIPTION="Scripts for uploading pictures to ITmages.ru"
 HOMEPAGE="https://github.com/itmages/itmages-service"
-EGIT_REPO_URI="git://github.com/itmages/itmages-service.git"
+SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
 
-RDEPEND="dev-python/pycurl
-	dev-python/dbus-python
-	dev-python/lxml
-	dev-python/pygobject"
+RDEPEND="dev-python/pycurl[${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# TODO: fix incorrect examples installation
+	rm -r "${ED}/usr/share/doc/itmages/example" || die
+}