diff -ruN xyzcmd.orig/Makefile xyzcmd/Makefile
--- xyzcmd.orig/Makefile	2010-01-20 08:18:34.000000000 +0300
+++ xyzcmd/Makefile	2010-01-20 08:16:46.000000000 +0300
@@ -8,8 +8,7 @@
 PORTNAME=	xyzcmd
 PORTVERSION=	0.0.3
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	g.veniamin@googlemail.com
 COMMENT=	Pure console visual file manager
@@ -20,6 +19,6 @@
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME=	${PORTNAME}
+INSTALLS_EGGINFO=yes
 
 .include <bsd.port.mk>
diff -ruN xyzcmd.orig/pkg-descr xyzcmd/pkg-descr
--- xyzcmd.orig/pkg-descr	2010-01-20 08:18:34.000000000 +0300
+++ xyzcmd/pkg-descr	2010-01-20 08:09:08.000000000 +0300
@@ -1,11 +1,16 @@
-Tight integration with python run-time system  most of the settings can be
-changed "on the fly" via management console. 
-Powerful configuration system - define own actions, aliases, internal commands,
-key bindings. 
-Extensible plug-in system - even core functionality implemented mainly using
-plugins, keeping base system small and clean. 
-Events & hooks subsystem - a flexible way of reacting on certain system events. 
-Customizable look-n-feel - every widget component look can be changed via skins 
-Unicode support
+XYZCommander is a pure console visual file manager.
+Main features:
+
+ * Tight integration with python run-time system - most of the
+   settings can be changed "on the fly" via management console.
+ * Powerful configuration system - define own actions, aliases,
+   internal commands, key bindings.
+ * Extensible plug-in system - even core functionality implemented
+   mainly using plug-ins, keeping base system small and clean.
+ * Events & hooks subsystem - a flexible way of reacting on certain
+   system events.
+ * Customizable look-n-feel - every widget component look can be
+   changed via skins.
+ * Unicode support 
 
 WWW:	http://code.google.com/p/xyzcmd/
diff -ruN xyzcmd.orig/pkg-plist xyzcmd/pkg-plist
--- xyzcmd.orig/pkg-plist	2010-01-20 08:18:34.000000000 +0300
+++ xyzcmd/pkg-plist	2010-01-20 08:18:58.000000000 +0300
@@ -215,7 +215,6 @@
 %%PYTHON_SITELIBDIR%%/libxyz/vfs/vfsobj.py
 %%PYTHON_SITELIBDIR%%/libxyz/vfs/vfsobj.pyc
 %%PYTHON_SITELIBDIR%%/libxyz/vfs/vfsobj.pyo
-%%PYTHON_SITELIBDIR%%/xyzcmd-0.0.3-py2.6.egg-info
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/api/api-objects.txt
 %%DOCSDIR%%/api/class-tree.html