diff --git a/net-misc/freerdp/Manifest b/net-misc/freerdp/Manifest
new file mode 100644
index 000000000..2f185d017
--- /dev/null
+++ b/net-misc/freerdp/Manifest
@@ -0,0 +1,2 @@
+DIST FreeRDP-1.0-beta4.tar.gz 3479473 RMD160 20c1663379661776e1b49bd5b84b136c346708da SHA1 6cf33bdccf62b51f04d47ac8353fbc90c5150a4c SHA256 cd8b5f5da6df35cc84a20de301eae28dbb4429ee5bd64f4810ca23b459638957
+EBUILD freerdp-1.0_beta4.ebuild 2167 RMD160 f662ca049341b58e24b296fec28c2e167a293d8c SHA1 7805858c6951f26dc95b21b5c0cb0f9571dd69c1 SHA256 e27f9378f1fffacd4ad599bc58d774c2db5d2e2df76f621c0aac955bb6ea66e0
diff --git a/net-misc/freerdp/freerdp-1.0_beta4.ebuild b/net-misc/freerdp/freerdp-1.0_beta4.ebuild
new file mode 100644
index 000000000..8a6bbc9e3
--- /dev/null
+++ b/net-misc/freerdp/freerdp-1.0_beta4.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/freerdp/freerdp-1.0_beta4.ebuild,v 1.1 2011/12/24 01:06:35 floppym Exp $
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="Client-side implementation of the Remote Desktop Protocol"
+HOMEPAGE="http://www.freerdp.com/"
+SRC_URI="https://github.com/downloads/FreeRDP/FreeRDP/FreeRDP-${PV/_/-}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cups directfb doc ffmpeg pulseaudio smartcard sse2 test X xinerama xv"
+
+FREERDP_DEBUG="transport chanman svc dvc kbd nla nego certificate license gdi
+	rfx x11 rail xv scard orders redir"
+IUSE+=" $(printf 'debug-%s ' ${FREERDP_DEBUG})"
+
+RDEPEND="
+	dev-libs/openssl
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	directfb? ( dev-libs/DirectFB )
+	ffmpeg? ( virtual/ffmpeg )
+	pulseaudio? ( media-sound/pulseaudio )
+	smartcard? ( sys-apps/pcsc-lite )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libxkbfile
+		xinerama? ( x11-libs/libXinerama )
+		xv? ( x11-libs/libXv )
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		X? (
+			app-text/docbook-xml-dtd:4.1.2
+			app-text/xmlto
+		)
+	)
+	test? ( dev-util/cunit )
+"
+
+DOCS=( README )
+
+# Test suite segfaults
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	mv FreeRDP-* "${S}" || die
+}
+
+CMAKE_VERBOSE=1
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with alsa ALSA)
+		$(cmake-utils_use_with cups CUPS)
+		$(cmake-utils_use_with doc MANPAGES)
+		$(cmake-utils_use_with directfb DIRECTFB)
+		$(cmake-utils_use_with ffmpeg FFMPEG)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		$(cmake-utils_use_with smartcard PCSC)
+		$(cmake-utils_use_with sse2 SSE2)
+		$(cmake-utils_use_with test CUNIT)
+		$(cmake-utils_use_with X X11)
+		$(cmake-utils_use_with X XCURSOR)
+		$(cmake-utils_use_with X XEXT)
+		$(cmake-utils_use_with X XKBFILE)
+		$(cmake-utils_use_with xinerama XINERAMA)
+		$(cmake-utils_use_with xv XV)
+	)
+	for i in ${FREERDP_DEBUG}; do
+		mycmakeargs+=(
+			$(cmake-utils_use_with debug-${i} DEBUG_$(LC_ALL=C echo ${i} | tr a-z A-Z))
+		)
+	done
+	cmake-utils_src_configure
+}