diff --git a/net-firewall/fwbuilder/Manifest b/net-firewall/fwbuilder/Manifest
new file mode 100644
index 0000000..ba06c23
--- /dev/null
+++ b/net-firewall/fwbuilder/Manifest
@@ -0,0 +1,4 @@
+AUX fwbuilder-5.0.0.3568-ccache.patch 930 RMD160 c0dcb60e659c3dc055dc45cb57d8091979654d1e SHA1 c9ae9432a59d56162009374e15d2defd86bf186b SHA256 869dc70d8a63b819e275d93be615f88df5d1bd7b0427ecfb29d766738f55bc4e
+AUX fwbuilder-5.0.0.3568-ldflags.patch 456 RMD160 12ec2ea7f5b0b1ff63b07e726d0f3ed17e8005ea SHA1 f327ff39251edc9efda702fca4acc77ae6e1c8d8 SHA256 f0d5093eb2cd116dd6e65bf60584e9d31a21b80f65d1d40649fd8be7c464a970
+DIST fwbuilder-5.0.0.3568.tar.gz 6703816 RMD160 2248f1f01581ce16c861e041230151d367a182c6 SHA1 1cbc00daf06ec1df9eb39df06c958f1fee44ebed SHA256 dc42956bfa5a0c4f703353ace2a36ddfec985f4431ab00c00ae0ac9ca6f672c0
+EBUILD fwbuilder-5.0.0.3568.ebuild 1250 RMD160 79420c132f71896430b1379978e57a46bc9c243b SHA1 716957fbb08447c549202ef4dcc020ed25d935db SHA256 17cd818d25a7080025e858b98f56ade4f9e5d6abebd268f6c055ca3b5ec8fde0
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ccache.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ccache.patch
new file mode 100644
index 0000000..807d9ac
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ccache.patch
@@ -0,0 +1,35 @@
+diff -ruN fwbuilder-4.2.2.3541.orig/configure.in fwbuilder-4.2.2.3541/configure.in
+--- fwbuilder-4.2.2.3541.orig/configure.in	2011-05-11 23:02:03.000000000 +0200
++++ fwbuilder-4.2.2.3541/configure.in	2011-05-29 18:53:06.624998022 +0200
+@@ -638,12 +638,27 @@
+ AC_SUBST(MANDIR)
+ AC_SUBST(ICONSDIR)
+ 
+-AC_PATH_PROG(CCACHE, ccache, , )
+-AC_SUBST(CCACHE)
++AC_ARG_WITH(ccache,[  --with-ccache=yes      Use ccache to speed up repeated compilation])
+ 
+-if test -n "$CCACHE"
+-then
++if test -n "$with_ccache"; then
++  if test "x$with_ccache" != "xno"; then
++    AC_PATH_PROG(CCACHE, ccache, , )
++    AC_SUBST(CCACHE)
++    if test -n "$CCACHE"
++    then
++      ccache -s
++    fi
++  else
++    CCACHE=""
++    AC_SUBST(CCACHE)
++  fi
++else
++  AC_PATH_PROG(CCACHE, ccache, , )
++  AC_SUBST(CCACHE)
++  if test -n "$CCACHE"
++  then
+         ccache -s
++  fi
+ fi
+ 
+ AC_ARG_WITH(distcc,[  --with-distcc=N        Use distcc with N parallel make count])
diff --git a/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
new file mode 100644
index 0000000..f6869db
--- /dev/null
+++ b/net-firewall/fwbuilder/files/fwbuilder-5.0.0.3568-ldflags.patch
@@ -0,0 +1,11 @@
+diff -ruN fwbuilder-4.2.2.3541.orig/qmake.inc.in fwbuilder-4.2.2.3541/qmake.inc.in
+--- fwbuilder-4.2.2.3541.orig/qmake.inc.in	2011-05-11 23:02:03.000000000 +0200
++++ fwbuilder-4.2.2.3541/qmake.inc.in	2011-05-15 19:36:03.000000000 +0200
+@@ -39,6 +39,7 @@
+     QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
+     QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter
+     QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter
++    QMAKE_LFLAGS = @LDFLAGS@
+ 
+     !macx {
+ 
diff --git a/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
new file mode 100644
index 0000000..9a053ab
--- /dev/null
+++ b/net-firewall/fwbuilder/fwbuilder-5.0.0.3568.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/fwbuilder/fwbuilder-4.2.2.3541.ebuild,v 1.5 2011/07/23 18:26:29 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils base qt4-r2 multilib 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=""
+
+DEPEND=">=x11-libs/qt-gui-4.3
+	dev-libs/openssl
+	dev-libs/elfutils
+	sys-devel/gnuconfig
+	!net-libs/libfwbuilder"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ldflags.patch"
+	"${FILESDIR}/${P}-ccache.patch"
+)
+
+src_prepare() {
+	qt4-r2_src_prepare
+	eautoreconf
+
+	# This package fundamentally changed its build system.  We have to
+	# manually copy config.{sub,guess} from /usr/share/gnuconfig/.
+	cp /usr/share/gnuconfig/config.{sub,guess} "${WORKDIR}/${P}/"	\
+		|| die "failed to copy config.{sub,guess}"
+}
+
+src_configure() {
+	econf --with-ccache=no --with-distcc=no
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+}
+
+pkg_postinst() {
+	validate_desktop_entries
+
+	elog "You need to emerge sys-apps/iproute2 on the machine"
+	elog "that will run the firewall script."
+}