diff --git a/dev-python/google-appengine/Manifest b/dev-python/google-appengine/Manifest
new file mode 100644
index 0000000..2d20aa9
--- /dev/null
+++ b/dev-python/google-appengine/Manifest
@@ -0,0 +1,3 @@
+AUX dev_appserver 285 RMD160 75ff13ca58600c1ac89130252ae444773cddfbee SHA1 fa15243388ccde8c8af4046f5d32c3477eb6c387 SHA256 56508e2a4d1a2ace0a1a2db28d8b5e94c67f0e10e3acce983fe9e680a29480c0
+DIST google_appengine_1.3.4.zip 3102472 RMD160 738042a64fb049982ae008d3a0716c73b19251e1 SHA1 1e5a792f2a479f00c288d9c2ac8c499f07e58b2f SHA256 347d6f8dd3ab96f422db6f519f7975d6c3541793f8a8ac40972b0bc43cae5514
+EBUILD google-appengine-1.3.4.ebuild 1123 RMD160 b81ff560a34af178d64104cd59dcf84ca24e2def SHA1 2c4013cc4445ebc05bd711b88653fa8cb192d9a8 SHA256 7c3a6178edf7f6f51eaf570dd560b1da7ac9b90338f53f6b85c9cb481d280b8f
diff --git a/dev-python/google-appengine/files/dev_appserver b/dev-python/google-appengine/files/dev_appserver
new file mode 100644
index 0000000..d53070f
--- /dev/null
+++ b/dev-python/google-appengine/files/dev_appserver
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+PYTHON=$(which python2.5)
+
+[ -x "${PYTHON}" ] || ( echo "ERROR: Python 2.5 not found"; exit 1)
+[ -f /usr/lib/google_appengine/dev_appserver.py ] || ( echo "ERROR: google_appengine not found in /usr/lib"; exit 1)
+
+cd /usr/lib/google_appengine
+"${PYTHON}" dev_appserver.py $@
diff --git a/dev-python/google-appengine/google-appengine-1.3.4.ebuild b/dev-python/google-appengine/google-appengine-1.3.4.ebuild
new file mode 100644
index 0000000..8992ab9
--- /dev/null
+++ b/dev-python/google-appengine/google-appengine-1.3.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+NEED_PYTHON=2.5
+
+inherit distutils eutils
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="GoogleAppEngine Framework"
+SRC_URI="http://googleappengine.googlecode.com/files/${MY_P}.zip"
+HOMEPAGE="http://code.google.com/appengine/"
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT="nomirror"
+
+RDEPEND="dev-python/pysqlite"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_compile() {
+	# Correct python interpreter version
+	find "${S}" -name "*.py" \
+		-exec sed -i "s|^#!/usr/bin/env python$|#!/usr/bin/env/python2.5|" {} +  \
+		|| die "Correcting python interpreter version failed"
+}
+
+src_install() {
+	exeinto /usr/bin
+	doexe "${FILESDIR}"/dev_appserver
+
+	exeinto /usr/lib/google_appengine
+	doexe *.py
+
+	insinto /usr/lib/google_appengine
+	doins -r google lib tools templates
+
+	dodoc BUGS LICENSE README RELEASE_NOTES VERSION
+	docinto demos/guestbook
+	dodoc demos/guestbook/*
+	docinto new_project_template
+	dodoc new_project_template/*
+}