Index: head/audio/icecast-kh/Makefile
===================================================================
--- head/audio/icecast-kh/Makefile	(revision 486860)
+++ head/audio/icecast-kh/Makefile	(revision 486861)
@@ -1,50 +1,52 @@
 # Created by: Anes Mukhametov <anes@anes.su>
 # $FreeBSD$
 
-PORTNAME=	icecast-kh
+PORTNAME=	icecast
 DISTVERSIONPREFIX=	icecast-
 DISTVERSION=	2.4.0-kh10
 CATEGORIES=	audio net ipv6
+PKGNAMESUFFIX=	-kh
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Streaming mp3/ogg-vorbis audio server, KH branch
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libogg.so:audio/libogg \
 		libtheora.so:multimedia/libtheora \
 		libvorbis.so:audio/libvorbis
 
 USES=		gmake gnome localbase pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	karlheyes
+GH_PROJECT=	icecast-kh
 USE_GNOME=	libxml2 libxslt
 USE_RC_SUBR=	icecast
 
 CONFLICTS_INSTALL=	icecast icecast2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OGG_PREFIX=${LOCALBASE}
 # /usr/bin/ld: error: undefined symbol: ERR_get_error
 LIBS+=		-L${OPENSSLLIB} -lcrypto
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=		CURL DOCS KATE SPEEX
 OPTIONS_DEFAULT=	CURL KATE SPEEX
 
 CURL_DESC=		Support Directory server interaction (YP) via curl
 KATE_DESC=		Support Kate/Skeleton codec within Ogg streams
 SPEEX_DESC=		Support Speex codec within Ogg streams
 
 CURL_CONFIGURE_WITH=	curl=${LOCALBASE}
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 
 KATE_CONFIGURE_WITH=	kate
 KATE_LIB_DEPENDS=	libkate.so:multimedia/libkate
 
 SPEEX_CONFIGURE_WITH=	speex=${LOCALBASE}
 SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 
 .include <bsd.port.mk>
Index: head/audio/icecast-kh/pkg-plist
===================================================================
--- head/audio/icecast-kh/pkg-plist	(revision 486860)
+++ head/audio/icecast-kh/pkg-plist	(revision 486861)
@@ -1,52 +1,52 @@
 bin/icecast
-etc/icecast.xml.sample
+@sample etc/icecast.xml.sample
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 @comment %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_admin.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_basicsetup.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_config_file.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_faq.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_glossary.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_listenerauth.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_relay.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_stats.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_win32.html
 %%PORTDOCS%%%%DOCSDIR%%/icecast2_yp.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%DATADIR%%/admin/listclients.xsl
 %%DATADIR%%/admin/listmounts.xsl
 %%DATADIR%%/admin/logs.xsl
 %%DATADIR%%/admin/manageauth.xsl
 %%DATADIR%%/admin/managerelays.xsl
 %%DATADIR%%/admin/moveclients.xsl
 %%DATADIR%%/admin/response.xsl
 %%DATADIR%%/admin/showlog.xsl
 %%DATADIR%%/admin/stats.xsl
 %%DATADIR%%/admin/updatemetadata.xsl
 %%DATADIR%%/admin/viewxml.xsl
 %%DATADIR%%/admin/xspf.xsl
 %%DATADIR%%/doc/icecast.xml.dist
 %%DATADIR%%/doc/icecast_minimal.xml.dist
 %%DATADIR%%/doc/icecast_shoutcast_compat.xml.dist
 %%DATADIR%%/web/7.xsl
 %%DATADIR%%/web/admin.html
 %%DATADIR%%/web/adminbar.html
 %%DATADIR%%/web/auth.xsl
 %%DATADIR%%/web/favicon.ico
 %%DATADIR%%/web/images/corner_bottomleft.jpg
 %%DATADIR%%/web/images/corner_bottomright.jpg
 %%DATADIR%%/web/images/corner_topleft.jpg
 %%DATADIR%%/web/images/corner_topright.jpg
 %%DATADIR%%/web/images/icecast.png
 %%DATADIR%%/web/images/key.png
 %%DATADIR%%/web/images/tunein.png
 %%DATADIR%%/web/index.html
 %%DATADIR%%/web/server_version.xsl
 %%DATADIR%%/web/status.xsl
 %%DATADIR%%/web/status2.xsl
 %%DATADIR%%/web/statusbar.html
 %%DATADIR%%/web/style.css