diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 0623a3a..8b13219 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,3 +1,3 @@
 AUX windowmaker-0.95.8-imagemagick7.patch 1340 BLAKE2B d3ba22b324a405cba0d0d266e2d25b0b6e41ece01cc42e18d3746c46d9e6f38f3048abe928ade603ec9f90206e19e285445e1de7775b18527602a0557d86aae1 SHA512 90316ffe66fe92f7db43afa504225bdb97ddb8ec8ff742f69760e4e233172e2b2f704449f014935f9851d6bd7ebe91cde97e5ae65dfb73284a21743a44b7492d
 DIST WindowMaker-extra-0.1.tar.gz 238018 BLAKE2B 865b12975d0cdefc1f05a76344b449fdcf8a2841d6a7adf1ab6435857d89cbc4fda22bb62432a1bbba921267380d00a0cded718bfbd344bbb5e6207e59b76096 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8
-EBUILD windowmaker-7777.ebuild 2923 BLAKE2B 485b74b9d5b7cebb4b9066d320292a6da6543e9cafccfaefcf5384de0069fd806dfac1db56b0b768c831356639cce72feab729fb7978ce9435f4217c2df49f26 SHA512 2d08315624f9283e1cbc93b28c59394db7438840d345eea26dfb483b73b72567ac9c1a49e8734db21efd39355c72913f53518f5086bd566c3f5d964fa3a65ee0
+EBUILD windowmaker-7777.ebuild 3057 BLAKE2B 21615643168093c1bb7ca569738d8dd285e251dffdd0d84619ae964e77faf6bbf6c8dcefd861dd9408b471b365a516eb643f04e78c844195e0b47ad6b51e4ad6 SHA512 7ea530b7fe7f2290344a66a959bd94ae3ab9e1338e7d0f8926016951c9d30bd65bf3ae9b2310e5cd5adea1989dd894b9ff309ed647f60f38bde22e5f4d08d307
diff --git a/x11-wm/windowmaker/windowmaker-7777.ebuild b/x11-wm/windowmaker/windowmaker-7777.ebuild
index 274e605..1633f7e 100644
--- a/x11-wm/windowmaker/windowmaker-7777.ebuild
+++ b/x11-wm/windowmaker/windowmaker-7777.ebuild
@@ -18,10 +18,11 @@ KEYWORDS="~amd64 ~x86"
 DEPEND="media-libs/fontconfig
 	>=x11-libs/libXft-2.1.0
 	x11-libs/libXmu
+	x11-libs/libXpm
 	x11-libs/libXt
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	imagemagick? ( media-gfx/imagemagick:0= )
+	imagemagick? ( >=media-gfx/imagemagick-7:0= )
 	jpeg? ( virtual/jpeg:0= )
 	png? ( media-libs/libpng:0= )
 	tiff? ( media-libs/tiff:0 )
@@ -39,6 +40,9 @@ src_unpack() {
 }
 
 src_prepare() {
+	local git_revision=$(git log --pretty=format:'%h' -n 1)
+	sed -i -e "s/\(AC_INIT(\[WindowMaker\],\[[^]]*\)\]/\1, rev.${git_revision}\]/" configure.ac || die
+
 	# Fix some paths
 	for file in WindowMaker/*menu* util/wmgenmenu.c; do
 		if [[ -r $file ]] ; then
@@ -48,9 +52,7 @@ src_prepare() {
 		fi;
 	done;
 
-	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
-		eapply "${FILESDIR}/${PN}-0.95.8-imagemagick7.patch"
-	fi
+
 
 	default
 	eautoreconf
@@ -97,7 +99,7 @@ src_install() {
 	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
-		  README* NEWS TODO
+		README* NEWS TODO
 
 	# WindowMaker Extra
 	cd ../WindowMaker-extra-0.1
@@ -112,4 +114,6 @@ src_install() {
 	doexe wmaker
 
 	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
 }