diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index 631162f8bc71..06fda4cf730b 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	wmicons
 PORTVERSION=	1.0
 CATEGORIES=	graphics windowmaker
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|sobomax/wmicons|} \
+MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
 		${MASTER_SITE_WINDOWMAKER} \
 		${MASTER_SITE_PORTS_JP} \
 		http://nether.tky.hut.fi/iconstore/ \
@@ -17,16 +17,15 @@ MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|sobomax/wmicons|} \
 		http://www.lab06.ee.u-tokai.ac.jp/~7jeem005/WindowMaker/Archives/
 MASTER_SITE_SUBDIR=	. contrib/icons beta/srcs
 DISTFILES=	${EXTRACT_ONLY} isiconpack4.tgz
-
-MAINTAINER=	kiri@pis.toba-cmt.ac.jp
-COMMENT=	Icons mainly for use in Window Maker
-
 EXTRACT_ONLY=	DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
 		NeXT_XEmacs_tar.gz  wm_icons_png.tar.gz wm_icons_tif.tar.gz \
 		japanese-step-icons1.1.tar.gz \
 		KTermIcons-1.0.tar.gz \
 		WindowMaker-extra-0.1.tar.gz
 
+MAINTAINER=	kiri@FreeBSD.org
+COMMENT=	Icons mainly for use in Window Maker
+
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/wmicons/pkg-descr b/graphics/wmicons/pkg-descr
index fb04435430da..ef7da65567f9 100644
--- a/graphics/wmicons/pkg-descr
+++ b/graphics/wmicons/pkg-descr
@@ -2,4 +2,4 @@ This package provides icons used in WindowMaker frequently.
 
 --
 KIRIYAMA Kazuhiko
-<kiri@pis.toba-cmt.ac.jp>
+<kiri@FreeBSD.org>
diff --git a/graphics/wmicons/pkg-plist b/graphics/wmicons/pkg-plist
index 31a991dcae5b..7a806d04d051 100644
--- a/graphics/wmicons/pkg-plist
+++ b/graphics/wmicons/pkg-plist
@@ -481,4 +481,4 @@ share/doc/wmicons/README.vf_tif
 @dirrm share/WindowMaker/Themes
 @dirrm share/WindowMaker/Pixmaps
 @dirrm share/WindowMaker/Icons
-@dirrm share/WindowMaker
+@unexec rmdir %D/share/WindowMaker 2>/dev/null || true