diff --git a/d-feet/Makefile b/d-feet/Makefile
index fa992b1eb0..2319edf592 100644
--- a/d-feet/Makefile
+++ b/d-feet/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2011/12/28 23:39:10 jihbed Exp $
+# $NetBSD: Makefile,v 1.8 2012/05/10 20:25:40 noud4 Exp $
 #
 
 DISTNAME=	d-feet-0.1.14
-EGG_NAME=	d_feet-0.1.14
-PKGREVISION=	1
+EGG_NAME=	${DISTNAME:S|d-|d_|}
+PKGREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/d-feet/0.1/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/d-feet/PLIST b/d-feet/PLIST
index 9ec22760ae..4c297a7d2e 100644
--- a/d-feet/PLIST
+++ b/d-feet/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2011/12/28 23:39:10 jihbed Exp $
-bin/d-feet2.7
-${PYSITELIB}/d_feet-${PKGVERSION}-py2.7.egg-info/PKG-INFO
-${PYSITELIB}/d_feet-${PKGVERSION}-py2.7.egg-info/SOURCES.txt
-${PYSITELIB}/d_feet-${PKGVERSION}-py2.7.egg-info/dependency_links.txt
-${PYSITELIB}/d_feet-${PKGVERSION}-py2.7.egg-info/top_level.txt
+@comment $NetBSD: PLIST,v 1.5 2012/05/10 20:25:40 noud4 Exp $
+bin/d-feet${PYVERSSUFFIX}
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/dfeet/DFeetApp.py
 ${PYSITELIB}/dfeet/DFeetApp.pyc
 ${PYSITELIB}/dfeet/DFeetApp.pyo