diff --git a/darkice/trunk/AUTHORS b/darkice/trunk/AUTHORS
index f7e4791..09cc55d 100644
--- a/darkice/trunk/AUTHORS
+++ b/darkice/trunk/AUTHORS
@@ -25,5 +25,4 @@ with contributions by:
     Nicholas J. Humfrey <njh@ecs.soton.ac.uk>
     Joel Ebel <jbebel@ncsu.edu>
     <jochen2@users.sourceforge.net>
-	Nicholas J Humfrey <njh@ecs.soton.ac.uk>
 
diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog
index 42cd2b0..f09dc91 100644
--- a/darkice/trunk/ChangeLog
+++ b/darkice/trunk/ChangeLog
@@ -1,4 +1,4 @@
-next release
+26-01-2006 DarkIce 0.17 released
 
     o added check for bufferSecs set to 0
       thanks to Toph <fangiotophia@gmail.com>
diff --git a/darkice/trunk/NEWS b/darkice/trunk/NEWS
index d1dddae..9895c6d 100644
--- a/darkice/trunk/NEWS
+++ b/darkice/trunk/NEWS
@@ -1,3 +1,8 @@
+26-01-2006, Akos Maroy, darkeye@users.sourceforge.net
+
+    Released version 0.17. See ChangeLog for changes.
+
+
 22-10-2005, Akos Maroy, darkeye@users.sourceforge.net
 
     Released version 0.16. See ChangeLog for changes.
diff --git a/darkice/trunk/etc/ebuild/darkice-0.17.ebuild b/darkice/trunk/etc/ebuild/darkice-0.17.ebuild
new file mode 100644
index 0000000..c40b481
--- /dev/null
+++ b/darkice/trunk/etc/ebuild/darkice-0.17.ebuild
@@ -0,0 +1,48 @@
+IUSE="encode mp2 oggvorbis aac alsa jack"
+
+DESCRIPTION="IceCast live streamer delivering Ogg, mp3, mp2 or aac streams simultaneously to multiple hosts."
+HOMEPAGE="http://darkice.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+
+DEPEND="encode?	( >=media-sound/lame-3.89 )
+        mp2? ( >=media-sound/twolame-0.3.6 )
+        oggvorbis? ( >=media-libs/libvorbis-1.0 )
+		aac? ( >=media-libs/faac-1.24 )
+        alsa? ( >=media-libs/alsa-lib-1.0.0 )
+        jack? ( media-sound/jack-audio-connection-kit )"
+
+src_compile() {
+	if ! use encode && ! use mp2 && ! use oggvorbis && ! use aac
+	then
+
+		eerror "You need support for mp3, Ogg Vorbis or FAAC enconding for this"
+		eerror "package. Please merge again with at least one of the "
+		eerror "\`encode', \'mp2', \`oggvorbis' or \'aac' USE flags enabled:"
+		eerror
+		eerror "  # USE=\"encode\" emerge darkice"
+		eerror "  # USE=\"mp2\" emerge darkice"
+		eerror "  # USE=\"oggvorbis\" emerge darkice"
+		eerror "  # USE=\"aac\" emerge darkice"
+		die "Won't build without support for lame, mp2, vorbis or aac"
+	fi
+
+	econf `use_with alsa` \
+	      `use_with encode lame` \
+	      `use_with mp2 twolame` \
+	      `use_with oggvorbis vorbis` \
+	      `use_with aac faac` \
+		  `use_with jack` || die
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die
+
+	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+}
diff --git a/darkice/trunk/etc/ebuild/twolame-0.3.6.ebuild b/darkice/trunk/etc/ebuild/twolame-0.3.6.ebuild
new file mode 100644
index 0000000..5f7907e
--- /dev/null
+++ b/darkice/trunk/etc/ebuild/twolame-0.3.6.ebuild
@@ -0,0 +1,21 @@
+DESCRIPTION="TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder"
+HOMEPAGE="http://www.twolame.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+
+DEPEND=">=media-libs/libsndfile-1.0.11"
+
+src_compile() {
+	econf || die
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	einstall docdir=${D}/usr/share/doc/${PF} || die
+
+	dodoc AUTHORS ChangeLog COPYING README TODO
+}
diff --git a/darkice/trunk/man/darkice.1 b/darkice/trunk/man/darkice.1
index 5488e64..7f6162a 100644
--- a/darkice/trunk/man/darkice.1
+++ b/darkice/trunk/man/darkice.1
@@ -98,7 +98,6 @@ Developed with contributions by
     Nicholas J. Humfrey <njh@ecs.soton.ac.uk>
     Joel Ebel <jbebel@ncsu.edu>
     <jochen2@users.sourceforge.net>
-    Nicholas J Humfrey <njh@ecs.soton.ac.uk>
 
 .SH LINKS
 Project homepage: