diff --git a/games-misc/osmos/Manifest b/games-misc/osmos/Manifest
new file mode 100644
index 000000000..949c54f79
--- /dev/null
+++ b/games-misc/osmos/Manifest
@@ -0,0 +1,3 @@
+AUX osmosis.desktop 274 RMD160 32ba46f5fdefc03affdaeb60a9ca2e6a2615266c SHA1 620463ff53c38e4b2e983bbe85293339123f146a SHA256 7388fb986b51064107ea5ba65c8ce8ead428ca910a61b18f1f91b162957c3bee
+DIST Osmos_1.6.0.tar.gz 20478208 RMD160 dd8bbd93aae3f0ec18acaf84777608e7106ac241 SHA1 75a42968a66109a66ad2ba1c5957cd2405ce508e SHA256 4b75fe092a6e3ed7df849293dfaa59c41e80f0c1c01cf1102a227304656fced6
+EBUILD osmos-1.6.0.ebuild 1489 RMD160 883a9ec904a98925cb08e37194bef6781e5821c5 SHA1 a5318a415d9ccdda5bcb91aa8d794f02f6e69ab8 SHA256 cbb0304d01b3567f82b6a262e4cf50dd830c45ce2603bf31695dc3aa39f4ed12
diff --git a/games-misc/osmos/files/osmosis.desktop b/games-misc/osmos/files/osmosis.desktop
new file mode 100644
index 000000000..9e4e404b6
--- /dev/null
+++ b/games-misc/osmos/files/osmosis.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Osmos
+GenericName=Osmos
+Comment=Enter the ambient world of Osmos: elegant, physics-based gameplay, dreamlike visuals, and a minimalist, electronic soundtrack.
+Exec=osmos
+Icon=/opt/osmos/Icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Game;
diff --git a/games-misc/osmos/osmos-1.6.0.ebuild b/games-misc/osmos/osmos-1.6.0.ebuild
new file mode 100644
index 000000000..5c4605478
--- /dev/null
+++ b/games-misc/osmos/osmos-1.6.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2010 Sabayon Linux
+# Distributed under the terms of the GNU General Public License v2
+# $Header:
+EAPI="2"
+
+inherit games
+
+MY_PN=${PN/o/O}
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Osmos by Hemisphere Games (included in the Humble Indie Bundle)"
+HOMEPAGE="http://www.hemispheregames.com/osmos"
+SRC_URI="${MY_P}.tar.gz"
+
+LICENSE="EULA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="media-libs/freetype
+	media-libs/openal
+	virtual/opengl
+	media-libs/libvorbis"
+
+RESTRICT="fetch strip"
+
+S="${WORKDIR}/${PN/o/O}"
+
+pkg_nofetch() {
+    elog "Please purchase ${MY_PN} from ${HOMEPAGE} to play."
+	elog "Then place the ${SRC_URI} file into ${DISTDIR} and retry,"
+}
+
+src_prepare() {
+	cd ${S}
+	# We provide our own wrapper
+	rm Osmos
+
+	cd Fonts
+	einfo "Fixing corrupted FortuneCity font"
+	echo -n $'\x5d\x19\xc3\x5c' | dd of=FortuneCity.ttf bs=1 conv=notrunc seek=128
+	echo -n $'\x80\x77' | dd of=FortuneCity.ttf bs=1 conv=notrunc seek=138
+}
+
+src_compile() { :; }
+
+src_install() {
+	cd ${S}
+
+	dodir ${GAMES_PREFIX_OPT}/${PN}/
+	cp -R ./* ${D}/${GAMES_PREFIX_OPT}/${PN}/
+
+	if use x86; then
+		games_make_wrapper osmos ${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin32 ${GAMES_PREFIX_OPT}/${PN}/
+		rm ${D}/${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin64
+	fi
+	if use amd64; then
+		games_make_wrapper osmos ${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin64 ${GAMES_PREFIX_OPT}/${PN}/
+		rm ${D}/${GAMES_PREFIX_OPT}/${PN}/${MY_PN}.bin32
+	fi
+
+	newicon Icons/64x64.png ${PN}.png
+	make_desktop_entry ${PN} Osmos
+
+	prepgamesdirs
+}
\ No newline at end of file