diff --git a/net-firewall/vuurmuur/Manifest b/net-firewall/vuurmuur/Manifest
index 80b4d81..2f398fc 100644
--- a/net-firewall/vuurmuur/Manifest
+++ b/net-firewall/vuurmuur/Manifest
@@ -1,4 +1,7 @@
 AUX vuurmuur.conf 312 RMD160 d28da3c2abe1c6ec3fc5060576670e871965899c SHA1 b2e66191901fbae74dade2842a01cb6765fd5732 SHA256 9aeb5a2e3a7ebce5d240a2c1986cc700ce4a21d4cb50fac7f3851e965ab7862d
 AUX vuurmuur.init 1257 RMD160 66087fa191a5a344d6671ff4aec2fb2f0315fc2d SHA1 7883be040d44ab925425c5eb2994dc85dbf5c7d4 SHA256 3179f7092f180a5287a6d0ed4519313df762f25a4de50acc376c5905729e0cae
 DIST Vuurmuur-0.8beta2.tar.gz 1877270 RMD160 d1f202adb5ab076ea7763c215faec2558100d5b6 SHA1 549cc3b7d8c86cac0cbccbb963a3b3d041e8ea70 SHA256 4c74de94698a0a4bca758322b5e4198afc27fb25401309a7ecff445742f28d0e
+DIST vuurmuur-conf_0.8~beta2-1+svn20110330.tar.gz 966635 RMD160 66737d30899ca957c1fbab628fd05210d8287d66 SHA1 f2b07d7c6c78381b22b88008462721bb748870ca SHA256 e04e05d89a0f12fcbb257cf5a353e1b0c92bf02385207b75805901a2994f4c57
+DIST vuurmuur_0.8~beta2-1+svn20110330.tar.gz 479582 RMD160 35456f290c24dd9b9b398625d25c7a8c7038c2c1 SHA1 ef8455f182afa98591c70705471db2262b613b26 SHA256 2411ac3b3db501bc7ae8a3f95c366aead92d5bfb275376bfadbda1e7bec9057e
 EBUILD vuurmuur-0.8_beta2.ebuild 2657 RMD160 80b00fef3e213eafe0a608b4ec98f15eef2c7b53 SHA1 6c49cf1bac909d40e7cc9e2414bcde48d617ce27 SHA256 300afcc8db1c1e12ea9fa9e8ea408e52388636b94b19a6fe5e86e6e9c90a1298
+EBUILD vuurmuur-0.8_beta2_p20110330.ebuild 2332 RMD160 dfd6bae15590b6c8772f033c81b518efce8bd85c SHA1 a27629a8a14aebbf028b994f3bcdd85ecf525d11 SHA256 a0428ccdf4ba9483836c4c8c69bb6a75300166eea199a9fba46d345ceeafbd16
diff --git a/net-firewall/vuurmuur/vuurmuur-0.8_beta2_p20110330.ebuild b/net-firewall/vuurmuur/vuurmuur-0.8_beta2_p20110330.ebuild
new file mode 100644
index 0000000..3720e38
--- /dev/null
+++ b/net-firewall/vuurmuur/vuurmuur-0.8_beta2_p20110330.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools multilib
+
+REL_TAG="0.8~beta2"
+
+MY_PV=${PV/_beta2_p/~beta2-1+svn}
+MY_P="${PN}_${MY_PV}"
+
+MY_CONF_PV=${PV/_beta2_p/~beta2-1+svn}-conf
+MY_CONF_P="${PN}-conf_${MY_PV}"
+
+DESCRIPTION="Frontend for iptables featuring easy to use command line utils, rule- and logdaemons"
+HOMEPAGE="http://www.vuurmuur.org"
+SRC_URI="ftp://ftp.vuurmuur.org/ubuntu/dists/jaunty/svn/${MY_P}.tar.gz
+	ftp://ftp.vuurmuur.org/ubuntu/dists/jaunty/svn/${MY_CONF_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="logrotate"
+
+DEPEND="=net-libs/libvuurmuur-${PV}
+	>=sys-libs/ncurses-5"
+RDEPEND="${DEPEND}
+	logrotate? ( app-admin/logrotate )"
+
+S="${WORKDIR}/${PN}-${REL_TAG}"
+
+src_prepare() {
+	eautoreconf
+	cd "${WORKDIR}/${PN}-conf-${REL_TAG}"
+	eautoreconf
+	sed -i 's/nb//' po/LINGUAS
+}
+
+src_configure() {
+	econf \
+		--with-libvuurmuur-includes=/usr/include \
+		--with-libvuurmuur-libraries=/usr/$(get_libdir)
+	cd "${WORKDIR}/${PN}-conf-${REL_TAG}"
+	econf \
+		--with-libvuurmuur-includes=/usr/include \
+		--with-libvuurmuur-libraries=/usr/$(get_libdir) \
+		--with-localedir=/usr/share/locale \
+		--with-widec=yes
+}
+
+src_compile() {
+	emake -C "../${PN}-conf-${REL_TAG}" || die "compiling vuurmuur_conf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installing vuurmuur failed"
+
+	newinitd "${FILESDIR}"/vuurmuur.init vuurmuur || die "installing init failed"
+	newconfd "${FILESDIR}"/vuurmuur.conf vuurmuur || die "installing conf failed"
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins scripts/vuurmuur-logrotate vuurmuur || die "installing logrotate config failed"
+	fi
+
+	insopts -m0600
+	insinto /etc/vuurmuur
+	newins config/config.conf.sample config.conf || die "installing config.conf failed"
+
+	cd "../${PN}-conf-${REL_TAG}"
+
+	emake DESTDIR="${D}" install || die "installing vuurmuur_conf failed"
+}
+
+pkg_postinst() {
+	elog "Please read the manual on www.vuurmuur.org now - you have"
+	elog "been warned!"
+	elog
+	elog "If this is a new install, make sure you define some rules"
+	elog "BEFORE you start the daemon in order not to lock yourself"
+	elog "out. The necessary steps are:"
+	elog "1) vuurmuur_conf"
+	elog "2) /etc/init.d/vuurmuur start"
+	elog "3) rc-update add vuurmuur default"
+}
diff --git a/net-libs/libvuurmuur/Manifest b/net-libs/libvuurmuur/Manifest
index d9b28e5..37dbedb 100644
--- a/net-libs/libvuurmuur/Manifest
+++ b/net-libs/libvuurmuur/Manifest
@@ -1,3 +1,5 @@
 AUX libvuurmuur-plugin-0.7.patch 2157 RMD160 cfd57c5ba0585cb8b4b4400df50766cbf5cdb697 SHA1 4121b1dd535c354f6b9844460d22fdcf0c5c9b11 SHA256 648e9ad862cb4751e05a9311f3f19033d549f72ad7287b39cbc5a514b4f6dde0
 DIST Vuurmuur-0.8beta2.tar.gz 1877270 RMD160 d1f202adb5ab076ea7763c215faec2558100d5b6 SHA1 549cc3b7d8c86cac0cbccbb963a3b3d041e8ea70 SHA256 4c74de94698a0a4bca758322b5e4198afc27fb25401309a7ecff445742f28d0e
+DIST libvuurmuur_0.8~beta2-1+svn20110330.tar.gz 491284 RMD160 c4df8177fe034cdddcd02c4dfbe254e434edc59c SHA1 f7ade81079def458cbe73a824df360ad1161958d SHA256 80bb84f002c579101d1939a47b7db5ab2d02a4dce7e11d3f48e41cf021a026c0
 EBUILD libvuurmuur-0.8_beta2.ebuild 1084 RMD160 c69f121bfcd7dd8ee2cb8453847e6db7fb87b0df SHA1 6bb88fd65d373add42f0b8cc54f7170c8a7dba7a SHA256 61ff6818cf4d370d8a05d5d4bdc5c7c5e8dc0a9862a28ada08dc9bb7980ee715
+EBUILD libvuurmuur-0.8_beta2_p20110330.ebuild 910 RMD160 3d708992a216ea46bfa2f5b2bab66ef3170f72af SHA1 87fba4f99c81601db96d9df24fa19e5cbceef730 SHA256 db9ad58d4a54df655ed134a12b77ce96e7d78b860fbe785b80583f3fe72db54d
diff --git a/net-libs/libvuurmuur/libvuurmuur-0.8_beta2_p20110330.ebuild b/net-libs/libvuurmuur/libvuurmuur-0.8_beta2_p20110330.ebuild
new file mode 100644
index 0000000..bb04649
--- /dev/null
+++ b/net-libs/libvuurmuur/libvuurmuur-0.8_beta2_p20110330.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools multilib
+
+MY_PV=${PV/_beta2_p/~beta2-1+svn}
+MY_P="${PN}_${MY_PV}"
+
+DESCRIPTION="Libraries and plugins required by Vuurmuur"
+HOMEPAGE="http://www.vuurmuur.org"
+SRC_URI="ftp://ftp.vuurmuur.org/ubuntu/dists/jaunty/svn/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-firewall/iptables"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}-0.8~beta2"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-plugindir=/usr/$(get_libdir)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "installing libvuurmuur failed"
+
+	# files needed but not yet installed by make
+	dodir /etc/vuurmuur/textdir || die "installing textdir failed"
+	insinto /etc/vuurmuur/plugins
+	doins plugins/textdir/textdir.conf || die "installing textdir.conf failed"
+}