diff --git a/sys-devel/openwatcom/Manifest b/sys-devel/openwatcom/Manifest
new file mode 100644
index 00000000..2cd5c5ba
--- /dev/null
+++ b/sys-devel/openwatcom/Manifest
@@ -0,0 +1,8 @@
+AUX build.sh.patch 494 RMD160 bd6a6cdc97c8c6d328581352a4270e7e2d8f5505 SHA1 f6872a0282e5f06157cfbfef7412600752089903 SHA256 a28399a67e990e0e87aa8f617d2e2df16a09b4aabcacd953b5974a936c910de9
+AUX wmake_c_mglob.c.patch 480 RMD160 be5c09f70696a57f666e920e62c26267720fa900 SHA1 1fc74047215bd607befb397f1f475d09cd9fe24d SHA256 2386c16c22e87d7547ff2c0d0d24e5ea8e8b15163f44e86f937c3e828768cd6d
+DIST open_watcom_1.7.1-src.tar.bz2 26173755 RMD160 cc9bc3a5bf41a560058a4ffb3d55146cf9d4b40a SHA1 b9289221ffa8a595fcfce6a1a94bef5808bdf629 SHA256 14410438afd2d331e89dd2ae60a6e75e2db1251bba6f8a416a4b5987f8f4c712
+DIST open_watcom_1.8.0-src.tar.bz2 27013448 RMD160 19051fed3a323aa271634ef398f146cabe195158 SHA1 7ac7ac7c6ed986e85d0fc080d0a06f3130d64b8e SHA256 191b66783e02d28f0c8503e9f82f820883134648349d8c917cefacb850ca4aef
+DIST open_watcom_1.9.0-src.tar.bz2 27927922 RMD160 198f43cd08dd3f1829c6eb1f1ebfd00dca509403 SHA1 70922850abed798dc7c766eceb7797345a94f22e SHA256 6d303327988ee2dda60cfabebf3f45a9758aee4da117d41cf3153fccb7e5e4bf
+EBUILD openwatcom-1.7.1.ebuild 976 RMD160 17557938f2b84bec9275174308d36c8ef84ac48a SHA1 3db448fd4c896418b3e75169eb52b575be9b69ae SHA256 35842399003cfeb167f1c33129680732a308774694d45b0b3d0f4980f91465e6
+EBUILD openwatcom-1.8.0.ebuild 1028 RMD160 26b28f6f94ed0076823615f61653cfd35303a66a SHA1 3cb317b6956c06c290a40a48f0c4cd52ce3052e4 SHA256 4a83b019e0278244308cc8422e74517c8c5c3ce39cdea6312fc3ac98f0c8fba8
+EBUILD openwatcom-1.9.0.ebuild 1025 RMD160 c01edd8ba99aedafad9a877d573d5d6c44264020 SHA1 d82fa4f541001dcb7068ff403655c92124cd84bb SHA256 6c10562ac979ffc1ff2cc3ed38a3fb7bc94c18570bbf611e051026d4d837dd90
diff --git a/sys-devel/openwatcom/files/build.sh.patch b/sys-devel/openwatcom/files/build.sh.patch
new file mode 100644
index 00000000..e642df70
--- /dev/null
+++ b/sys-devel/openwatcom/files/build.sh.patch
@@ -0,0 +1,16 @@
+--- orig/build.sh	2009-10-07 10:55:38.000000000 +0200
++++ new/build.sh	2009-10-07 10:55:19.000000000 +0200
+@@ -4,10 +4,10 @@
+ # using the GNU C/C++ compiler tools. If you already have a working
+ # Open Watcom compiler, you do not need to use the bootstrap process
+ 
+-if [ -f setvars ]; then
+-    . setvars
++if [ -f ./setvars ]; then
++    . ./setvars
+ else
+-    . setvars.sh
++    . ./setvars.sh
+ fi
+ if [ ! -f $DEVDIR/build/binl/wtouch ]; then
+     cp -p `which touch` $DEVDIR/build/binl/wtouch
diff --git a/sys-devel/openwatcom/files/wmake_c_mglob.c.patch b/sys-devel/openwatcom/files/wmake_c_mglob.c.patch
new file mode 100644
index 00000000..82ba7d91
--- /dev/null
+++ b/sys-devel/openwatcom/files/wmake_c_mglob.c.patch
@@ -0,0 +1,12 @@
+--- OW18src/bld/wmake/c/mglob.c.orig	2009-02-23 18:40:32.000000000 -0500
++++ OW18src/bld/wmake/c/mglob.c	2009-10-09 19:39:05.000000000 -0400
+@@ -110,6 +110,8 @@
+     "__UNIX__=\n"
+     #if defined(__386__) || defined(__i386__) || defined(__i386)
+         "__LINUX386__=\n"
++    #elif defined(__x86_64)
++        "__LINUX386__=\n"
+     #elif defined(__PPC__) || defined(__ppc__) || defined(__powerpc__)
+         "__LINUXPPC__=\n"
+     #elif defined(__MIPS__)  || defined(__mips__)
+
diff --git a/sys-devel/openwatcom/openwatcom-1.7.1.ebuild b/sys-devel/openwatcom/openwatcom-1.7.1.ebuild
new file mode 100644
index 00000000..895e5113
--- /dev/null
+++ b/sys-devel/openwatcom/openwatcom-1.7.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+LICENSE="OWPL-1"
+DESCRIPTION="The Open Watcom compiler"
+HOMEPAGE="http://www.openwatcom.org"
+SRC_URI="ftp://ftp.heanet.ie/pub/openwatcom/source/open_watcom_${PV}-src.tar.bz2"
+
+KEYWORDS="~x86"
+SLOT="0"
+IUSE="examples source"
+
+DEPEND="sys-devel/gcc"
+
+RESTRICT=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	epatch "${FILESDIR}/build.sh.patch"
+}
+
+src_compile() {
+	./build.sh || die "build.sh failed"
+}
+
+src_install() {
+	mkdir -p "${D}"/opt
+	cp -R rel2 "${D}"/opt/openwatcom
+	ln -s binl "${D}"/opt/openwatcom/bin
+
+	use examples || rm -rf "${D}"/opt/openwatcom/samples
+	use source || rm -rf "${D}"/opt/openwatcom/src
+
+	INSTALL_DIR=/opt/openwatcom
+
+	local env_file=05${PN}
+	cat > ${env_file} <<-EOF
+		WATCOM=${INSTALL_DIR}
+		INCLUDE=${INSTALL_DIR}/lh
+		PATH=${INSTALL_DIR}/binl
+	EOF
+	doenvd ${env_file} || die "doenvd ${env_file} failed"
+}
diff --git a/sys-devel/openwatcom/openwatcom-1.8.0.ebuild b/sys-devel/openwatcom/openwatcom-1.8.0.ebuild
new file mode 100644
index 00000000..3e91e627
--- /dev/null
+++ b/sys-devel/openwatcom/openwatcom-1.8.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+LICENSE="OWPL-1"
+DESCRIPTION="The Open Watcom compiler"
+HOMEPAGE="http://www.openwatcom.org"
+SRC_URI="ftp://ftp.heanet.ie/pub/openwatcom/source/open_watcom_${PV}-src.tar.bz2"
+
+KEYWORDS="~x86"
+SLOT="0"
+IUSE="examples source"
+
+DEPEND="sys-devel/gcc"
+
+RESTRICT=""
+
+S=${WORKDIR}/OW18src
+
+src_prepare() {
+	epatch "${FILESDIR}/build.sh.patch"
+	epatch "${FILESDIR}/wmake_c_mglob.c.patch"
+}
+
+src_compile() {
+	./build.sh || die "build.sh failed"
+}
+
+src_install() {
+	mkdir -p "${D}"/opt
+	cp -R rel2 "${D}"/opt/openwatcom
+	ln -s binl "${D}"/opt/openwatcom/bin
+
+	use examples || rm -rf "${D}"/opt/openwatcom/samples
+	use source || rm -rf "${D}"/opt/openwatcom/src
+
+	INSTALL_DIR=/opt/openwatcom
+
+	local env_file=05${PN}
+	cat > ${env_file} <<-EOF
+		WATCOM=${INSTALL_DIR}
+		INCLUDE=${INSTALL_DIR}/lh
+		PATH=${INSTALL_DIR}/binl
+	EOF
+	doenvd ${env_file} || die "doenvd ${env_file} failed"
+}
diff --git a/sys-devel/openwatcom/openwatcom-1.9.0.ebuild b/sys-devel/openwatcom/openwatcom-1.9.0.ebuild
new file mode 100644
index 00000000..4aaca563
--- /dev/null
+++ b/sys-devel/openwatcom/openwatcom-1.9.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+
+inherit eutils
+
+LICENSE="OWPL-1"
+DESCRIPTION="The Open Watcom compiler"
+HOMEPAGE="http://www.openwatcom.org"
+SRC_URI="ftp://ftp.heanet.ie/pub/openwatcom/source/open_watcom_${PV}-src.tar.bz2"
+
+KEYWORDS="~x86"
+SLOT="0"
+IUSE="examples source"
+
+DEPEND="sys-devel/gcc"
+
+RESTRICT=""
+
+S=${WORKDIR}/OW19
+
+src_prepare() {
+	epatch "${FILESDIR}/build.sh.patch"
+	epatch "${FILESDIR}/wmake_c_mglob.c.patch"
+}
+
+src_compile() {
+	./build.sh || die "build.sh failed"
+}
+
+src_install() {
+	mkdir -p "${D}"/opt
+	cp -R rel2 "${D}"/opt/openwatcom
+	ln -s binl "${D}"/opt/openwatcom/bin
+
+	use examples || rm -rf "${D}"/opt/openwatcom/samples
+	use source || rm -rf "${D}"/opt/openwatcom/src
+
+	INSTALL_DIR=/opt/openwatcom
+
+	local env_file=05${PN}
+	cat > ${env_file} <<-EOF
+		WATCOM=${INSTALL_DIR}
+		INCLUDE=${INSTALL_DIR}/lh
+		PATH=${INSTALL_DIR}/binl
+	EOF
+	doenvd ${env_file} || die "doenvd ${env_file} failed"
+}