diff --git a/sys-apps/hwdata-redhat/Manifest b/sys-apps/hwdata-redhat/Manifest
new file mode 100644
index 000000000..5d09b6fe7
--- /dev/null
+++ b/sys-apps/hwdata-redhat/Manifest
@@ -0,0 +1,2 @@
+DIST hwdata-0.220-1.fc10.src.rpm 756721 RMD160 c1f358a619cd03c7b8fd2fd72988d4079cf91e9e SHA1 665f3cf0099cac63c274cd8730f6d2f642b22d5c SHA256 a50c8e97fb8604338502bb2a8a4c2389cf0dddfe6d98164c144129f68b8e235f
+EBUILD hwdata-redhat-0.220.ebuild 1148 RMD160 9e8790c6dc6979d5015c8c6d2c099c5e21ba3ae9 SHA1 65f1f90af3a976748627d7586bf58f52b9b9443f SHA256 9ea12a97180aa081f6bacb0e47a33339049e0a60c0038fa317f21a557c519267
diff --git a/sys-apps/hwdata-redhat/hwdata-redhat-0.220.ebuild b/sys-apps/hwdata-redhat/hwdata-redhat-0.220.ebuild
new file mode 100644
index 000000000..5d127613e
--- /dev/null
+++ b/sys-apps/hwdata-redhat/hwdata-redhat-0.220.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwdata-redhat/hwdata-redhat-0.217.ebuild,v 1.1 2008/07/15 17:05:57 darkside Exp $
+
+inherit flag-o-matic rpm
+
+# Tag for which Fedora Core version it's from
+FCVER="10"
+# Revision of the RPM. Shouldn't affect us, as we're just grabbing the source
+# tarball out of it
+RPMREV="1"
+
+MY_P="${P/-redhat}"
+DESCRIPTION="Hardware identification and configuration data"
+HOMEPAGE="http://fedora.redhat.com/projects/config-tools/"
+SRC_URI="mirror://fedora-dev/releases/10/Everything/source/SRPMS/${MY_P}-${RPMREV}.fc${FCVER}.src.rpm"
+LICENSE="GPL-2 MIT"
+SLOT="0"
+KEYWORDS="~ppc ~ppc64 ~x86 ~amd64"
+IUSE="test"
+RDEPEND=">=sys-apps/module-init-tools-3.2
+	!sys-apps/hwdata-gentoo"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/pciutils )"
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	rpm_src_unpack ${A}
+
+	cd "${S}"
+	sed -i -e "s:\(/sbin\/lspci\):/usr\1:g" Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	# Don't let it overwrite a udev-installed file
+	rm -rf "${D}"/etc/ || die
+}
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
new file mode 100644
index 000000000..fce5cc541
--- /dev/null
+++ b/sys-apps/hwsetup/Manifest
@@ -0,0 +1,2 @@
+DIST hwsetup_1.2-7.tar.gz 10706 RMD160 7895b32c81254b2ca1575ab12dcc6fa39d011e17 SHA1 c91cb22c07755ecbfce8e9e6826e8e2580f103f8 SHA256 aa72b37ce306b5191cabd31eb5f19ab2a5e635697a263c6735d10c7bf99f9589
+EBUILD hwsetup-1.2-r2.ebuild 1960 RMD160 685504836bcc1c5962462f3b38ee6e08eab986d4 SHA1 51663b46e53c6aefa69651e57141794f69724df4 SHA256 0ae5f2724fb155618623cced3f69f171baf9582d9853481478ffa810aebcd56b
diff --git a/sys-apps/hwsetup/hwsetup-1.2-r2.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r2.ebuild
new file mode 100644
index 000000000..db9f5b053
--- /dev/null
+++ b/sys-apps/hwsetup/hwsetup-1.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2-r1.ebuild,v 1.3 2008/10/14 09:30:11 robbat2 Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_PV=${PV}-7
+DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD"
+HOMEPAGE="http://www.knopper.net/"
+SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz"
+#http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 -mips ppc ppc64 sparc x86"
+IUSE="zlib"
+
+COMMON_DEPEND="zlib? ( sys-libs/zlib )
+	sys-apps/pciutils"
+DEPEND="${COMMON_DEPEND}
+	sys-libs/libkudzu"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwdata-redhat"
+
+pkg_setup() {
+	ewarn "This package is designed for use on the LiveCD only and will do "
+	ewarn "unspeakably horrible and unexpected things on a normal system."
+	ewarn "YOU HAVE BEEN WARNED!!!"
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch \
+		"${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \
+		"${FILESDIR}"/${PV}-3-fastprobe.patch \
+		"${FILESDIR}"/${MY_PV}-gentoo.patch
+}
+
+src_compile() {
+	append-ldflags -s
+	filter-ldflags -Wl,--as-needed --as-needed
+	if use zlib ; then
+		sed -i \
+			-e '/^LIBS=/s,-lpci,-lz -lpci,g' \
+			Makefile
+	elif built_with_use --missing false sys-apps/pciutils zlib ; then
+		die "You need to build with USE=zlib to match sys-apps/pcituils"
+	fi
+	emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
+	keepdir /etc/sysconfig
+}
+
+pkg_postinst() {
+	ewarn "This package is intended for usage on the Gentoo release media.  If"
+	ewarn "you are not building a CD, remove this package.  It will not work"
+	ewarn "properly on a running system, as Gentoo does not use any of the"
+	ewarn "Knoppix-style detection except for CD builds."
+}