diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
new file mode 100644
index 0000000..2e1361e
--- /dev/null
+++ b/net-firewall/fwbuilder/Manifest
@@ -0,0 +1,3 @@
+AUX fwbuilder-2.1.13-build-with-external-antlr.patch 2231 RMD160 9356ee2f594189bda1e5b3e9776258ea9358fa9f SHA1 e4c906033690160437b6722038d58ab94b2d36a8 SHA256 8f5e490b90ad1a30104c0103cbd23c6cc66739fb152b0263beea5e56678f8599
+DIST fwbuilder-2.1.17.tar.gz 1889486 RMD160 7a0ed1d8fd514b88cf0bdd05e0505651a9e6911e SHA1 af1898248826151c21566f5994a2f0506c63f6f5 SHA256 45d48d1e3106cdee6ff023cd0dffbd4b17e3e7b6be32f4fc3a7c5f9f22d40b54
+EBUILD fwbuilder-2.1.17.ebuild 1943 RMD160 61123dfdc4c2dbcd8aa3e3116423ced1fa6be821 SHA1 437a8f8498ec1b568c56b6af3a4e27dffaca0672 SHA256 5d4d0faf9cbb362d2a054db68b01373610518e7f8b03c01197628feef62ae72b
diff --git a/net-firewall/fwbuilder/fwbuilder-2.1.17.ebuild b/net-firewall/fwbuilder/fwbuilder-2.1.17.ebuild
new file mode 100644
index 0000000..175fdc1
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-2.1.17.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-2.1.14.ebuild,v 1.1 2007/09/29 23:04:46 r3pek Exp $
+
+inherit eutils qt3 autotools
+
+DESCRIPTION="A firewall GUI"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+DEPEND="~net-libs/libfwbuilder-${PV}
+	nls? ( >=sys-devel/gettext-0.11.4 )
+	>=dev-libs/libxslt-1.0.7"
+
+src_compile() {
+	# we'll use our eqmake instead of bundled script to process qmake files
+	sed -i -e 's:^. ./runqmake.sh$:echo:' configure \
+		|| die "sed configure failed"
+	# prevent install script from automatically stripping binaries - let portage do that
+	sed -i -e 's/s) stripcmd="$stripprog"$/s)/' install.sh \
+		|| die "sed install.sh failed"
+	# documentation will be installed manually using dodoc & doman
+	rm -f doc/doc.pro
+	sed -i -e '/^SUBDIRS = po src doc/s/ doc//' fwbuilder2.pro \
+		|| die "sed fwbuilder2.pro failed"
+
+	econf $(use_enable nls) || die "configure failed"
+
+	# use eqmake to generate Makefiles
+	eqmake3 fwbuilder2.pro
+	for subdir in po src src/res src/tools src/gui \
+			src/fwblookup src/fwbedit src/ipt src/pflib \
+			src/pf src/ipf src/ipfw src/parsers; do
+		eqmake3 "${subdir}/${subdir##*/}.pro" -o ${subdir}/Makefile
+	done
+
+	emake || die "make failed"
+}
+
+src_install() {
+	emake install DDIR="${D}" || die "install failed"
+
+	cd doc
+	dodoc AUTHORS ChangeLog Credits README* \
+		FWBuilder-Routing-LICENSE.txt PatchAcceptancePolicy.txt
+	newdoc ReleaseNotes_${PV}.txt ReleaseNotes
+	doman fwb*.1
+	cd ..
+
+	newicon src/gui/icons/firewall_64.png ${PN}.png
+	make_desktop_entry fwbuilder "Firewall Builder" ${PN} "System;Security;Qt"
+}
+
+pkg_postinst() {
+	echo
+	elog "You need to emerge sys-apps/iproute2 on the machine"
+	elog "that will run the firewall script."
+	echo
+}
diff --git a/net-libs/libfwbuilder/Manifest b/net-libs/libfwbuilder/Manifest
new file mode 100644
index 0000000..581abb0
--- /dev/null
+++ b/net-libs/libfwbuilder/Manifest
@@ -0,0 +1,2 @@
+DIST libfwbuilder-2.1.17.tar.gz 318061 RMD160 46807882012209b7a6cd463e0cb3f68aebe3f7df SHA1 695d9cee51d9ae8036296b9bc68f54a656478263 SHA256 3bbbddb5f5e580bd5c5aa0189b54b71677b981fe0e33f1ec55914b5d9e70b829
+EBUILD libfwbuilder-2.1.17.ebuild 1363 RMD160 ff04168702105cdd5ccac5a174d16085e8f58c1d SHA1 5ebda309a91612e8197d9c590826619a1b30c3a6 SHA256 3597d7a39fd28ff0bbcec10bf13654655e6a93c8402d0f170b34ed10944f3bb4
diff --git a/net-libs/libfwbuilder/libfwbuilder-2.1.17.ebuild b/net-libs/libfwbuilder/libfwbuilder-2.1.17.ebuild
new file mode 100644
index 0000000..fb366bc
--- /dev/null
+++ b/net-libs/libfwbuilder/libfwbuilder-2.1.17.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libfwbuilder/libfwbuilder-2.1.14.ebuild,v 1.1 2007/09/29 23:02:52 r3pek Exp $
+
+inherit eutils qt3
+
+DESCRIPTION="Firewall Builder 2.1 API library and compiler framework"
+HOMEPAGE="http://www.fwbuilder.org/"
+SRC_URI="mirror://sourceforge/fwbuilder/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="snmp ssl stlport"
+
+DEPEND=">=dev-libs/libxml2-2.4.10
+	>=dev-libs/libxslt-1.0.7
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( dev-libs/openssl )
+	stlport? ( dev-libs/STLport )
+	$(qt_min_version 3)"
+
+src_compile() {
+	# we'll use our eqmake instead of bundled script to process qmake files
+	sed -i -e 's:^. ./runqmake.sh$:echo:' configure \
+		|| die "sed configure failed"
+
+	econf   $(use_with ssl openssl) \
+		$(use_with snmp ucdsnmp) \
+		$(use_with stlport stlport) \
+		|| die "configure failed"
+
+	# use eqmake to generate Makefiles
+	eqmake3 ${PN}.pro
+	for subdir in src src/fwbuilder src/fwcompiler src/test src/confscript \
+			etc doc migration; do
+		eqmake3 "${subdir}/${subdir##*/}.pro" -o ${subdir}/Makefile
+	done
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	emake install DDIR="${D}" || die "Install failed"
+
+	cd "${D}"/usr/share/doc/${PF}
+	rm COPYING INSTALL
+	prepalldocs
+}