diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog
index 1d7c59f..d3bbc69 100644
--- a/darkice/trunk/ChangeLog
+++ b/darkice/trunk/ChangeLog
@@ -1,3 +1,7 @@
+18-05-2006 DarkIce 0.18 released
+
+	o bugfix: reconnecting works more reliably
+
 26-01-2006 DarkIce 0.17 released
 
     o added check for bufferSecs set to 0
diff --git a/darkice/trunk/NEWS b/darkice/trunk/NEWS
index 9895c6d..ec96233 100644
--- a/darkice/trunk/NEWS
+++ b/darkice/trunk/NEWS
@@ -1,3 +1,8 @@
+18-05-2006, Akos Maroy, darkeye@users.sourceforge.net
+
+    Released version 0.18. See ChangeLog for changes.
+
+
 26-01-2006, Akos Maroy, darkeye@users.sourceforge.net
 
     Released version 0.17. See ChangeLog for changes.
diff --git a/darkice/trunk/configure.in b/darkice/trunk/configure.in
index 2452a1f..a9d1503 100644
--- a/darkice/trunk/configure.in
+++ b/darkice/trunk/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(darkice, 0.17)
+AC_INIT(darkice, 0.18)
 AC_CONFIG_SRCDIR(src/DarkIce.cpp)
 AM_CONFIG_HEADER(src/config.h)
 
diff --git a/darkice/trunk/etc/ebuild/darkice-0.18.ebuild b/darkice/trunk/etc/ebuild/darkice-0.18.ebuild
new file mode 100644
index 0000000..ae70ac0
--- /dev/null
+++ b/darkice/trunk/etc/ebuild/darkice-0.18.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header$
+
+DESCRIPTION="IceCast live streamer, delivering ogg and mp3 streams simultaneously to multiple hosts."
+HOMEPAGE="http://darkice.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="alsa encode jack vorbis"
+
+DEPEND="encode?	( >=media-sound/lame-1.89 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	jack? ( media-sound/jack-audio-connection-kit )"
+
+src_compile() {
+	if ! use encode && ! use vorbis
+	then
+
+		eerror "You need support for mp3 or Ogg Vorbis enconding for this"
+		eerror "package. Please merge again with at least one of the "
+		eerror "\`encode' and \`vorbis' USE flags enabled:"
+		eerror
+		eerror "  # USE=\"encode\" emerge darkice"
+		eerror "  # USE=\"vorbis\" emerge darkice"
+		die "Won't build without support for lame nor vorbis"
+	fi
+
+	econf $(use_with alsa) \
+	      $(use_with encode lame) \
+		  $(use_with jack) \
+	      $(use_with vorbis) || die "configuration failed"
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	einstall darkicedocdir=${D}/usr/share/doc/${PF} || die "make install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/darkice/trunk/etc/rpm/darkice.spec b/darkice/trunk/etc/rpm/darkice.spec
index f99a7aa..ee85641 100644
--- a/darkice/trunk/etc/rpm/darkice.spec
+++ b/darkice/trunk/etc/rpm/darkice.spec
@@ -4,7 +4,7 @@ Summary : DarkIce live IceCast / ShoutCast streamer
 Name: darkice
 Vendor: Tyrell Hungary
 Packager: Akos Maroy <darkeye@tyrell.hu>
-Version: 0.16
+Version: 0.18
 Release: 1.%{dist}
 Copyright: GPL
 Group: Applications/Multimedia
@@ -52,6 +52,8 @@ rm -rf %{buildroot}
 
 
 %changelog 
+* Thu May 18 2006 Akos Maroy <darkeye@tyrell.hu> 0.18-1
+- rewrite the spec file for 0.18
 * Tue Apr 19 2005 Akos Maroy <darkeye@tyrell.hu> 0.16-1
 - rewrite the spec file for 0.16
 * Tue Apr 19 2005 Akos Maroy <darkeye@tyrell.hu> 0.15-1