diff --git a/devel/py-xdg/Makefile b/devel/py-xdg/Makefile
index b65cd109fc6e..71cff87826da 100644
--- a/devel/py-xdg/Makefile
+++ b/devel/py-xdg/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdg
 PORTVERSION=	0.14
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.freedesktop.org/~lanius/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +22,7 @@ USE_REINPLACE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/etc|${PREFIX}/etc|g ; \
+		's|/etc|${X11BASE}/etc|g ; \
 		s|%%X11BASE%%|${X11BASE}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 			${WRKSRC}/xdg/BaseDirectory.py \
diff --git a/devel/py-xdg/files/patch-xdg::IconTheme.py b/devel/py-xdg/files/patch-xdg::IconTheme.py
index ebe012ed215e..c368e385f246 100644
--- a/devel/py-xdg/files/patch-xdg::IconTheme.py
+++ b/devel/py-xdg/files/patch-xdg::IconTheme.py
@@ -1,10 +1,12 @@
---- xdg/IconTheme.py.orig	Mon Mar 29 13:37:54 2004
-+++ xdg/IconTheme.py	Fri Jun 25 17:04:04 2004
-@@ -212,7 +212,9 @@
+--- xdg/IconTheme.py.orig	Sun Jun  5 14:20:19 2005
++++ xdg/IconTheme.py	Sun Jun  5 14:21:07 2005
+@@ -215,7 +215,11 @@
  icondirs = []
  for basedir in xdg_data_dirs:
  	icondirs.append(os.path.join(basedir, "icons"))
 -icondirs.append("/usr/share/pixmaps")
++icondirs.append("%%X11BASE%%/share/pixmaps")
++icondirs.append("%%LOCALBASE%%/share/pixmaps")
 +icondirs.append("%%X11BASE%%/share/gnome/pixmaps")
 +icondirs.append("%%X11BASE%%/share/icons")
 +icondirs.append("%%LOCALBASE%%/share/icons")