diff --git a/srcpkgs/yquake2/INSTALL b/srcpkgs/yquake2/INSTALL
new file mode 100644
index 00000000000..9d79e9f9fb1
--- /dev/null
+++ b/srcpkgs/yquake2/INSTALL
@@ -0,0 +1,12 @@
+case "${ACTION}" in
+post)
+	cat <<EOF
+=========================================================================
+
+To run yquake2 you need data files. Get the Quake 2 data files from
+somewhere. Copy the data files to '~/.yq2/baseq2'.
+
+=========================================================================
+EOF
+	;;
+esac
diff --git a/srcpkgs/yquake2/files/yquake2.desktop b/srcpkgs/yquake2/files/yquake2.desktop
new file mode 100644
index 00000000000..6b3d91bad3b
--- /dev/null
+++ b/srcpkgs/yquake2/files/yquake2.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Quake II
+Comment=Yamagi Quake II Client
+Icon=yquake2
+Exec=yquake2
+Categories=Game;Shooter;
+Terminal=false
+StartupNotify=false
diff --git a/srcpkgs/yquake2/template b/srcpkgs/yquake2/template
new file mode 100644
index 00000000000..c2825c9f57a
--- /dev/null
+++ b/srcpkgs/yquake2/template
@@ -0,0 +1,31 @@
+# Template file for 'yquake2'
+pkgname=yquake2
+version=5.22
+revision=1
+wrksrc="quake2-${version}"
+hostmakedepends="pkg-config"
+makedepends="zlib-devel libopenal-devel alsa-lib-devel libjpeg-turbo-devel
+ SDL2-devel libvorbis-devel desktop-file-utils hicolor-icon-theme"
+depends="desktop-file-utils hicolor-icon-theme"
+short_desc="An enhanced client for id Software's Quake II (Yamagi Quake II)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+homepage="http://www.yamagi.org/quake2/"
+distfiles="http://deponie.yamagi.org/quake2/quake2-${version}.tar.xz"
+checksum=1d7dc91b429cbb30e9777e4da445ffe38c85f2bfb6773f989ce2e6d33805d66f
+
+do_build() {
+	 make ${makejobs} WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=/usr/share/${pkgname}
+}
+
+do_install() {
+	vinstall release/quake2 755 usr/bin ${pkgname}
+	vinstall release/q2ded 755 usr/bin ${pkgname}-q2ded
+	vinstall release/baseq2/game.so 644 usr/share/${pkgname}/baseq2
+
+	vinstall README 644 usr/share/doc/${pkgname}
+	vinstall stuff/yq2.cfg 644 usr/share/doc/${pkgname}
+
+	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
+	vinstall stuff/icon/Quake2.png 644 usr/share/pixmaps ${pkgname}.png
+}