diff --git a/www/libxpg4-ns/Makefile b/www/libxpg4-ns/Makefile
index ab4b22493cd4..12745804f199 100644
--- a/www/libxpg4-ns/Makefile
+++ b/www/libxpg4-ns/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 #
 
-PORTNAME=	libxpg4-ns
+PORTNAME=	libxpg4
 PORTVERSION= 	3.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sada
-DISTNAME=	libxpg4-3.3
+PKGNAMESUFFIX=	-ns
 
 MAINTAINER=	sada@FreeBSD.ORG
 
diff --git a/www/libxpg4-ns/pkg-plist b/www/libxpg4-ns/pkg-plist
index 343f355e7829..713de12502cf 100644
--- a/www/libxpg4-ns/pkg-plist
+++ b/www/libxpg4-ns/pkg-plist
@@ -3,3 +3,4 @@ lib/aout/libxpg4-ns.so.2.0
 lib/aout/libxpg4-ns_p.a
 @exec env OBJFORMAT=aout ldconfig -m %B
 @unexec env OBJFORMAT=aout ldconfig -R %B
+@unexec rmdir %B 2>/dev/null || true