diff --git a/media-sound/songbird-bin/Manifest b/media-sound/songbird-bin/Manifest
index 30aacf8d9..27b66a8db 100644
--- a/media-sound/songbird-bin/Manifest
+++ b/media-sound/songbird-bin/Manifest
@@ -5,6 +5,9 @@ DIST Songbird_1.7.3-1700_linux-i686.tar.gz 19371722 RMD160 98cf433a647fab995d04b
 DIST Songbird_1.7.3-1700_linux-x86_64.tar.gz 20768061 RMD160 9d6e9e1a61e4d0c2b40113be69887d1b25d78f2a SHA1 3fed1eb110a79478a049243fe8d7e32dd3a22703 SHA256 4cd2b74853033c4be84668e147ee427ee026b9d99116a06b31115ed9120eb42c
 DIST Songbird_1.8.0b1-1704_linux-i686.tar.gz 19881470 RMD160 740c1b2c372f28476fabb2e97d8cded4c4a4a03e SHA1 bdc92419e4997ce4ebed2cad5bdb9452e0e5d7aa SHA256 70c1b32762c358e3ec1822e950bf753fb2b29b5d6d5369e4c20b21a098a6abb5
 DIST Songbird_1.8.0b1-1704_linux-x86_64.tar.gz 21218653 RMD160 92eeb44f6514b7c4896e18b447df3784b3538289 SHA1 221bac9c48004aa8fba8f45ef804f2d3624ad558 SHA256 8cd63d3766a49dee0c6fa067eb2be473010a12189be5f2e0f0d5c7758c646de4
+DIST Songbird_1.8.0b3-1747_linux-i686.tar.gz 19892562 RMD160 b3816a51c51387c3abaf8971fa1e513528bbefcf SHA1 83aa96c4a40cbb46af069ece32573852a6ab842b SHA256 63dadb83b98df5823254ebea689159766deab0df85f5f683327984f36ac9eb86
+DIST Songbird_1.8.0b3-1747_linux-x86_64.tar.gz 21226434 RMD160 59570db1fdd81eeb02f98545d976a40bfcad51f1 SHA1 91bd3b7bf29bd5d2561b9917518678a52397227c SHA256 ef7bd13a2d98c323f75c2c82f7687fff9402639789fa09196043546e48fb7eae
 EBUILD songbird-bin-1.4.3.1438.ebuild 3036 RMD160 3288ee8c4554b1bf6ed99c5f871c5cc4222b0f62 SHA1 97e746b075084b32ae33782e6b62e3b715fdaef7 SHA256 17ebe430116865588124fbe1502c4e109174a88979f6731047315abf718ae60e
 EBUILD songbird-bin-1.7.3.1700.ebuild 2936 RMD160 8202fb01b6ddc4931a2bb8cd4aff36f35a697f24 SHA1 b02d7ed9df31520173659cbdadd756637fa96b6c SHA256 35ce94457a4cec3e61430dc0a06d47a795ce4133ec7ef641213c88a3f3bea682
 EBUILD songbird-bin-1.7.9.1704.ebuild 3038 RMD160 33698d02c3e160776a9e2d404940b4911614a7a4 SHA1 e7633154ab6e71badaab9b1d207a3649229fec28 SHA256 2dcb6f2b2a7db2eb41889f1a0305babcf86985b4bdf5db5dd7e265d396b00dd1
+EBUILD songbird-bin-1.8.0.1800.ebuild 3093 RMD160 7a8be99588a886442a18c6a6e63988bcdf515216 SHA1 69b6c1e79f136c36ae111477e504c19ace629302 SHA256 1f436db3ec6c57c075c458bfc1ccadd6f168b2c6f0177ed1eb95209bdada63b9
diff --git a/media-sound/songbird-bin/songbird-bin-1.8.0.1800.ebuild b/media-sound/songbird-bin/songbird-bin-1.8.0.1800.ebuild
new file mode 100644
index 000000000..a895824a4
--- /dev/null
+++ b/media-sound/songbird-bin/songbird-bin-1.8.0.1800.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils versionator pax-utils
+
+MY_VER="1.8.0b3-1747"
+MY_PN="Songbird"
+S="${WORKDIR}/${MY_PN}"
+
+DESCRIPTION="Great, fast and free multimedia player, inspired by iTunes"
+HOMEPAGE="http://songbirdnest.com/"
+SRC_URI="amd64? ( http://download.songbirdnest.com/installer/linux/x86_64/${MY_PN}_${MY_VER}_linux-x86_64.tar.gz  )
+	x86? ( http://download.songbirdnest.com/installer/linux/i686/${MY_PN}_${MY_VER}_linux-i686.tar.gz ) "
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="alsa oss esd ogg flac faac faad musepack ugly theora speex ffmpeg gnome jpeg"
+RESTRICT="strip"
+RDEPEND="${DEPEND}
+	alsa? ( media-plugins/gst-plugins-alsa )
+	oss?  ( media-plugins/gst-plugins-oss )
+	esd?  ( media-plugins/gst-plugins-esd )
+	ogg? ( media-plugins/gst-plugins-ogg
+			media-plugins/gst-plugins-vorbis )
+	gnome? ( media-plugins/gst-plugins-gconf
+			media-plugins/gst-plugins-gnomevfs )
+	flac? ( media-plugins/gst-plugins-flac )
+	faac? ( media-plugins/gst-plugins-faac )
+	faad? ( media-plugins/gst-plugins-faad )
+	ugly?  ( media-libs/gst-plugins-ugly )
+	musepack? ( media-plugins/gst-plugins-musepack )
+	theora? ( media-plugins/gst-plugins-theora )
+	speex? ( media-plugins/gst-plugins-speex )
+	ffmpeg? ( media-plugins/gst-plugins-ffmpeg )
+	jpeg? ( media-plugins/gst-plugins-jpeg )"
+DEPEND="${RDEPEND}
+	x11-libs/libXdmcp
+	x11-libs/libXau
+	x11-libs/libXfixes
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXext
+	x11-libs/libX11
+	dev-libs/liboil
+	media-libs/gstreamer
+	media-libs/gst-plugins-base
+	media-plugins/gst-plugins-x
+	media-plugins/gst-plugins-xvideo
+	media-plugins/gst-plugins-lame
+	media-plugins/gst-plugins-mpeg2dec
+	media-plugins/gst-plugins-mad
+	>=net-libs/neon-0.26.4
+	media-plugins/gst-plugins-neon
+	>=sys-libs/glibc-2.3.2
+	>=x11-libs/gtk+-2.0.0
+	x11-libs/libXft
+	x11-libs/pango"
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}/${PN}-1.2.0-symlink.patch"
+}
+
+src_install() {
+	einfo "unbundling gst, theora and vorbis libs"
+	find lib \( \
+		-name "libgst*" -o -name "libtheora*" -o \
+		-name "libvorbis*" -o -name "libogg*" -o -name "libFLAC*" \) \
+		-exec rm -v \{\} \; || die
+	insinto /opt/songbird
+	doins -r *
+	fperms 755 /opt/songbird/songbird
+	fperms 755 /opt/songbird/songbird-bin
+	dosym /opt/songbird/songbird /opt/bin/songbird-bin
+#	pax-mark -c /opt/songbird/songbird-bin || die
+#	pax-mark -m /opt/songbird/songbird-bin || die
+
+	newicon "${S}"/chrome/icons/default/default.xpm ${PN}.xpm
+	make_desktop_entry ${PN} ${PN} ${PN}.xpm "AudioVideo;Player"
+}
+
+pkg_postinst() {
+	pax-mark -m /opt/songbird/songbird-bin || die
+	echo
+	ewarn "This ebuild is not supported by Gentoo, so"
+	ewarn "please do not send any bugs at Gentoo's bugzilla."
+	einfo "If you need help, find it here:"
+	einfo "http://tnij.org/songbird-at-fgo"
+	einfo ""
+	einfo "If You need other music/video plugins, look at"
+	einfo "Your portage tree into media-plugins/gst-plugins-*,"
+	einfo "but remember, that not all plugins are supported yet."
+	echo
+}
+