diff --git a/games-rpg/machinarium/Manifest b/games-rpg/machinarium/Manifest
new file mode 100644
index 0000000..7386620
--- /dev/null
+++ b/games-rpg/machinarium/Manifest
@@ -0,0 +1,4 @@
+AUX Machinarium.png 30712 SHA256 57344931e558c89b1700aebfd753328061ce4caa1174459e951d1adc215059ac SHA512 b0d68098f292c771b2f26414407f4dca160c62d4e09972493953cba1a7fbe0f7812709c2aa4a961f08d94a7c5982c3924b62c2bbdad1b2491677bc9e462b8e0c WHIRLPOOL 8a02356372a7deb5a6a71f6c7c8339a6de04ac20ca7993ec8a0811e72c07d51e414e108bf9461bd0fef8e282c47f8fae3dbfef383aef2914c65cc8fde66d29dd
+DIST Machinarium_full_en.tar.gz 392779212 SHA256 d4a83bfdce3c27fb34956be74774458f8636e164802af835a11f2f36e653b63a SHA512 517ee1e0e56198a35afd8504b268a2f74c57e7e199444fcac6c4e84efc722fda21a4a15b33a7212bb0b60fcc431cbdfff1e5cae46d2511722885cfbd8363d9dd WHIRLPOOL e40570d32987130735409df1fd69fe7dae51d2d8ba4b6a389e0a0b8e7aae5d3de70d572631b7aee1e430f3f7275e71874d162274a3e71e2001dfea52b918c9db
+EBUILD machinarium-1.0.ebuild 2738 SHA256 86e7c91ae0c86c209ec5e601ad15497cb294a41f586533ec2ab5708506fddb56 SHA512 5205996c272d05ab28bcc684779e52b536c97e33d710d4dca7eb01f6f3b0fa9a3b7b824e84dea225ca953557ce7e91ef7743ddcf878491abf8fd8dc5e176f6f9 WHIRLPOOL b23444064fe07b6701944a0f2d59c6ea3ed9382e021eb67f01e085dfb8b2985a6b5632666af72b8dbe79b1d9819716bff480cddd868eca660e63043d2cd0c594
+MISC metadata.xml 248 SHA256 7b43be15755627edf5c12cf1b50c607d781558640bf8375d685d51d7ade99a32 SHA512 29f9b96b0a77546cce6a8bffd82fae2fd0939d32a7a05ffd0d91f9250a019a3ddaa599b93988c82daabb9c4c4b284dd947e2c47f6ca7727b8539cffa91bcb8c2 WHIRLPOOL 993013c9878ead35469db13d3072f694a341ee654182e0c31d0678f5dd6de4bdc8d59a0b7bb6d685dc41ea6b55dac518cd8034131baea8002170c680e50304d1
diff --git a/games-rpg/machinarium/files/Machinarium.png b/games-rpg/machinarium/files/Machinarium.png
new file mode 100644
index 0000000..f4297c5
Binary files /dev/null and b/games-rpg/machinarium/files/Machinarium.png differ
diff --git a/games-rpg/machinarium/machinarium-1.0.ebuild b/games-rpg/machinarium/machinarium-1.0.ebuild
new file mode 100644
index 0000000..357c45f
--- /dev/null
+++ b/games-rpg/machinarium/machinarium-1.0.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit games multilib
+
+DESCRIPTION="Point-and-click adventure about robot in steam-punk world"
+HOMEPAGE="http://machinarium.net/"
+
+SLOT="0"
+LICENSE="all-rights-reserved"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="fetch mirror"
+IUSE="+multilib"
+ABI="x86"
+
+MY_PN="${PN/ma/Ma}"
+SRC_URI="${MY_PN}_full_en.tar.gz"
+
+RDEPEND="
+	multilib? (
+		app-arch/bzip2[abi_x86_32(-)]
+		dev-libs/atk[abi_x86_32]
+		dev-libs/expat[abi_x86_32]
+		dev-libs/glib:2[abi_x86_32]
+		dev-libs/libffi[abi_x86_32]
+		dev-libs/nspr[abi_x86_32]
+		dev-libs/nss[abi_x86_32]
+		media-libs/fontconfig[abi_x86_32]
+		media-libs/freetype:2[abi_x86_32]
+		=media-libs/libpng-1.5*[abi_x86_32]
+		virtual/opengl[abi_x86_32]
+		sys-apps/util-linux[abi_x86_32]
+		sys-libs/zlib[abi_x86_32]
+		x11-libs/cairo[abi_x86_32]
+		x11-libs/gdk-pixbuf[abi_x86_32]
+		x11-libs/gtk+:2[abi_x86_32]
+		x11-libs/libdrm[abi_x86_32]
+		x11-libs/libICE[abi_x86_32]
+		x11-libs/libSM[abi_x86_32]
+		x11-libs/libX11[abi_x86_32]
+		x11-libs/libXau[abi_x86_32]
+		x11-libs/libxcb[abi_x86_32]
+		x11-libs/libXcomposite[abi_x86_32]
+		x11-libs/libXcursor[abi_x86_32]
+		x11-libs/libXdamage[abi_x86_32]
+		x11-libs/libXdmcp[abi_x86_32]
+		x11-libs/libXext[abi_x86_32]
+		x11-libs/libXfixes[abi_x86_32]
+		x11-libs/libXi[abi_x86_32]
+		x11-libs/libXinerama[abi_x86_32]
+		x11-libs/libXrandr[abi_x86_32]
+		x11-libs/libXrender[abi_x86_32]
+		x11-libs/libXt[abi_x86_32]
+		x11-libs/libXxf86vm[abi_x86_32]
+		x11-libs/pango[abi_x86_32]
+		x11-libs/pixman[abi_x86_32]
+	)
+	!multilib? (
+		app-arch/bzip2
+		dev-libs/atk
+		dev-libs/expat
+		dev-libs/glib:2
+		dev-libs/libffi
+		dev-libs/nspr
+		dev-libs/nss
+		media-libs/fontconfig
+		media-libs/freetype:2
+		=media-libs/libpng-1.5*
+		virtual/opengl
+		sys-apps/util-linux
+		sys-libs/zlib
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libdrm
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXau
+		x11-libs/libxcb
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXt
+		x11-libs/libXxf86vm
+		x11-libs/pango
+		x11-libs/pixman
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_PN}"
+
+REQUIRED_USE="amd64? ( multilib )"
+pkg_nofetch() {
+	ewarn
+	ewarn "Place ${A} to ${DISTDIR}"
+	ewarn
+}
+
+src_install() {
+	local dir="${GAMES_PREFIX_OPT}/${PN}"
+
+	insinto "${dir}"
+	exeinto "${dir}"
+	doexe "${MY_PN}"
+	rm "${MY_PN}"
+	doins -r *
+
+	games_make_wrapper "${PN}" "./${MY_PN}" "${dir}"
+	doicon "${FILESDIR}/${MY_PN}.png"
+	make_desktop_entry "${PN}" "${MY_PN}" "${MY_PN}"
+
+	prepgamesdirs
+}
diff --git a/games-rpg/machinarium/metadata.xml b/games-rpg/machinarium/metadata.xml
new file mode 100644
index 0000000..67a771c
--- /dev/null
+++ b/games-rpg/machinarium/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>manuel@fritteli.ch</email>
+		<name>Manuel Friedli</name>
+	</maintainer>
+</pkgmetadata>