diff --git a/net-analyzer/bro/Manifest b/net-analyzer/bro/Manifest
index f80c7269d..30f886a23 100644
--- a/net-analyzer/bro/Manifest
+++ b/net-analyzer/bro/Manifest
@@ -1,4 +1,4 @@
-DIST bro-1.5.3.tar.gz 4441838 SHA256 7ccb657d38e00cfa2d07f067ad701189e1ac238610089e67f6b4023734adf80e
 DIST bro-2.2.tar.gz 9646602 SHA256 86909361c2d804681f314604a6ce763be663937b2f045c8d25d810528a633dc9 SHA512 d5301e60b3929708002a42e72076778a94907c5aceb57d9dfc7b9d6b2840ac66840c2027a7aa4545895ef53094e910bc4cdbff972eb476d587591c44626a2215 WHIRLPOOL 239e4cc355fbcd09cf9b6a9233b7e76cb26c304d3e87f83f484561dd91bb0c539fcad8b829b8790f0afe56f6a1a2377b9f4002cfedd65ee521a528e2114ac3eb
-EBUILD bro-1.5.3.ebuild 897 SHA256 be57d3e333ca83a52a78b233ff3244dc1154c1936671a2b220a787bed4001c0f SHA512 c6a9d5382c47e33ae5ddc532f01431bf8ffd70742674d693b9307c5645fa80f31e44231f70311d0f2e562f9dcfb772efe7a2a810885d2f1755f82923debe34dc WHIRLPOOL 575789364e53b61d15993d909ff86b28e4a469dbdb03470b6cdb85b76a8718ddf27ad3f40a80ab001c05e5d9ccab098a5e5ba8450675776750359423a8e2f38d
+DIST bro-2.3.tar.gz 10283001 SHA256 46bb9f46fbe71b22afd12ad12e0eb32033fb991a2a60b3bc2d881750249b85cd SHA512 333925a08a9b394c60604a75b4943973d6f6f45ad12967b32861b4d012581bdbd011defc89d6c790c45a772c60b136352ce3a0d950196a7ef7482a5864708315 WHIRLPOOL a912fbd05accde3c4f5f1e39f5d64b2229a6c80226affa70017631fda12caea3d11d8b01ecbeb55a2edcd903c5761831f20d3a553a9a487e265b44b16607be5e
 EBUILD bro-2.2.ebuild 1049 SHA256 7ac79db23a474459e3fb03e905c3b5e4549532ad5f77c9dced61a2d28724bcfd SHA512 865f8125f8bbeee3f8ac54b8e8b4fcd933dc1c323c6a9360fdd7f0f99c696494bfa38787a92ae25d31aa03dd53a60f83493bc0a19c5be8d9e144c9f4a8d9018f WHIRLPOOL 049bcf8f1e72a7eff84368b3d89af40fa543fe651f62d93a213bac9b019af8d81a98a4e9d2792be49ecf38d65ef4fd90b96d2e5c409fec15120c0a1df2d3d0fc
+EBUILD bro-2.3.ebuild 1055 SHA256 311655ba7493f8c36c5d94d0cf59b0c7ed6d455488fe03b346fcba077ed44638 SHA512 9779b1e4eeccab17840e4eaa6989a8d08346388744324979e1623cace9ce3edbf5fb3cd3b356f2dc991e70e69bf56c63015996848ca64ef341754c7193d2ae6e WHIRLPOOL e4a6e62a5073aa058a8a9ddb2cb436dde93c256cc871a1e63f0f0f148bc75819e929675c585fefe5a2c284b15923d56fad00e5269662e695937675a56f6319e7
diff --git a/net-analyzer/bro/bro-1.5.3.ebuild b/net-analyzer/bro/bro-1.5.3.ebuild
deleted file mode 100644
index 16c000068..000000000
--- a/net-analyzer/bro/bro-1.5.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-DESCRIPTION="a advanced intrusion detection system"
-HOMEPAGE="http://bro-ids.org/"
-# upstream doesn't know what it's packaging oO
-SRC_URI="ftp://bro-ids.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug ipv6 perftools"
-
-DEPEND="dev-libs/geoip
-		dev-libs/openssl
-		sys-apps/file
-		net-libs/libpcap
-		sys-libs/ncurses
-		perftools? ( dev-util/google-perftools )"
-RDEPEND="$DEPEND"
-
-src_prepare() {
-	# ugly workaround
-	sed -i 's|shippedpcap broctl cluster nbdns|shippedpcap broctl cluster nbdns malloc0returnsnull|g' configure
-}
-
-src_configure() {
-	econf \
-		$(use_enable debug)\
-		$(use ipv6 && echo --enable-brov6)\
-		$(use_enable perftools)
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	DESTDIR="${D}" emake install || die "install failed"
-}
diff --git a/net-analyzer/bro/bro-2.3.ebuild b/net-analyzer/bro/bro-2.3.ebuild
new file mode 100644
index 000000000..a1634ea3b
--- /dev/null
+++ b/net-analyzer/bro/bro-2.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+
+inherit cmake-utils
+
+DESCRIPTION="a advanced intrusion detection system"
+HOMEPAGE="http://www.bro.org/"
+SRC_URI="http://www.bro.org/downloads/release/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~arm"
+IUSE="debug ipv6 perftools"
+
+DEPEND="dev-libs/geoip
+		dev-libs/openssl
+		sys-apps/file
+		net-libs/libpcap
+		sys-libs/ncurses
+		net-misc/curl
+		dev-lang/swig
+		perftools? ( dev-util/google-perftools )"
+RDEPEND="$DEPEND"
+
+src_configure() {
+	# bro uses special configure script for cmake
+	# neither cmake-utils_xxx nor econf work correctly.
+	./configure \
+	--prefix="${EPREFIX}"/usr \
+	--scriptdir="${EPREFIX}"/usr/share/bro \
+	--conf-files-dir="${EPREFIX}"/etc/bro \
+	$(use debug && echo --enable-debug)\
+	$(use ipv6  && echo --enable-mobile-ipv6)\
+	$(use perftools && echo --enable-perftools)
+}
+
+src_compile() {
+	cd build && emake -j1
+}
+
+src_install() {
+	DESTDIR="${D}" emake install || die "install failed"
+}