diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index c923360e..fcb57a57 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -1,6 +1,7 @@
 (
-    x11-wm/i3[~scm]
+    games-rpg/valyriatear
     media-sound/pnmixer[~scm]
+    x11-wm/i3[~scm]
     x11-apps/terminator[~scm]
 ) [[
     *author = [ Julian Ospald <hasufell@posteo.de> ]
diff --git a/packages/games-rpg/valyriatear/valyriatear-1.0.0.exheres-0 b/packages/games-rpg/valyriatear/valyriatear-scm.exheres-0
similarity index 75%
rename from packages/games-rpg/valyriatear/valyriatear-1.0.0.exheres-0
rename to packages/games-rpg/valyriatear/valyriatear-scm.exheres-0
index 44b3bb41..b7e288c4 100644
--- a/packages/games-rpg/valyriatear/valyriatear-1.0.0.exheres-0
+++ b/packages/games-rpg/valyriatear/valyriatear-scm.exheres-0
@@ -1,15 +1,22 @@
-# Copyright 2014 Julian Ospald <hasufell@posteo.de>
+# Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+SCM_REPOSITORY="git://github.com/ValyriaTear/ValyriaTear.git"
+SCM_luabind_REPOSITORY="git://github.com/ValyriaTear/luabind"
+SCM_SECONDARY_REPOSITORIES="luabind"
+SCM_EXTERNAL_REFS="src/luabind:luabind"
+SCM_CHECKOUT_TO=${PN}
+
 require gtk-icon-cache freedesktop-desktop
-require cmake [ api=2 ]
+require scm-git
+require cmake
 
 MY_PNV=ValyriaTear-${PV}
 
 SUMMARY="A free 2D J-RPG based on the Hero of Allacrost engine"
 HOMEPAGE="http://valyriatear.blogspot.de/
 	https://github.com/Bertram25/ValyriaTear"
-DOWNLOADS="https://github.com/Bertram25/ValyriaTear/archive/${PV}/${PNV}.tar.gz"
+DOWNLOADS=""
 
 LICENCES="GPL-2 GPL-3 CCPL-Attribution-ShareAlike-3.0 CCPL-Attribution-3.0 CC0 OFL-1.1"
 SLOT="0"
@@ -32,9 +39,9 @@ DEPENDENCIES="
         media-libs/libpng:=[>=1.5]
         media-libs/libvorbis
         media-libs/openal
-        media-libs/SDL:0[X]
-        media-libs/SDL_image:1
-        media-libs/SDL_ttf:0
+        media-libs/SDL:2[X]
+        media-libs/SDL_image:2
+        media-libs/SDL_ttf:2
         x11-dri/glu
         x11-dri/mesa
         x11-libs/libX11