diff --git a/net/gini/Makefile b/net/gini/Makefile
index fb3b22dfae84..de0a616ec71a 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -10,28 +10,24 @@ MASTER_SITES=	SF/${PORTNAME}/OldFiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight media streaming server
 
-LIB_DEPENDS=	vorbis.4:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USES=		gmake
-USE_BZIP2=	yes
+USES=		tar:bzip2 gmake
 USE_GNOME=	glib12
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
-MAN1=		ginicon.1 ginifeed.1
-MAN8=		gini.8
-
 MAKE_JOBS_UNSAFE=yes
 
-NO_STAGE=	yes
+OPTIONS_DEFINE=	DOCS
+
 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/gini.sh.sample ${PREFIX}/etc/rc.d
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-.endif
+	${INSTALL_SCRIPT} ${FILESDIR}/gini.sh.sample ${STAGEDIR}${PREFIX}/etc/rc.d
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/gini/pkg-plist b/net/gini/pkg-plist
index bcb7b0052be9..5a5da33584de 100644
--- a/net/gini/pkg-plist
+++ b/net/gini/pkg-plist
@@ -1,6 +1,9 @@
 bin/ginicon
 bin/ginifeed
 etc/rc.d/gini.sh.sample
+man/man1/ginicon.1.gz
+man/man1/ginifeed.1.gz
+man/man8/gini.8.gz
 sbin/gini
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%@dirrm %%DOCSDIR%%