diff --git a/srcpkgs/SDL/SDL-devel.template b/srcpkgs/SDL/SDL-devel.template
index 6391837038..09c3b0b390 100644
--- a/srcpkgs/SDL/SDL-devel.template
+++ b/srcpkgs/SDL/SDL-devel.template
@@ -1,18 +1,15 @@
 # Template file for 'SDL-devel'.
 #
-depends="libX11-devel libXext-devel libXrender-devel alsa-lib-devel SDL"
+depends="libX11-devel libXext-devel libXrender-devel libXi-devel alsa-lib-devel SDL>=$version"
 short_desc="${short_desc} (development files)"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+do_install() {
+	vmove usr/bin usr
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share usr
 }
diff --git a/srcpkgs/SDL/template b/srcpkgs/SDL/template
index 5ebe5ac57f..bc3cf9d27b 100644
--- a/srcpkgs/SDL/template
+++ b/srcpkgs/SDL/template
@@ -1,18 +1,21 @@
 # Template file for 'SDL'
 pkgname=SDL
 version=1.2.15
+revision=2
 patch_args="-Np1"
-distfiles="http://www.libsdl.org/release/SDL-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-alsa --disable-esd --disable-rpath
 --enable-clock_gettime --disable-nas --disable-arts"
-depends="libXext libXrender libX11 alsa-lib libpulseaudio"
-makedepends="pkg-config nasm libXext-devel libXrender-devel libX11-devel MesaLib-devel alsa-lib-devel pulseaudio-devel"
-revision=1
+# The following run-time dependencies are dlopen(3)ed.
+subpackages="$pkgname-devel"
+depends="libX11 libXext libXrender libXi alsa-lib libpulseaudio"
+makedepends="pkg-config nasm libXext-devel libXrender-devel libX11-devel
+MesaLib-devel alsa-lib-devel pulseaudio-devel"
 short_desc="Simple Directmedia Layer"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.libsdl.org/"
 license="LGPL-2.1"
+distfiles="http://www.libsdl.org/release/SDL-$version.tar.gz"
 checksum=d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00
 long_desc="
  Simple DirectMedia Layer is a cross-platform multimedia library designed
@@ -20,7 +23,3 @@ long_desc="
  via OpenGL, and 2D video framebuffer. It is used by MPEG playback software,
  emulators, and many popular games, including the award winning Linux port
  of Civilization: Call To Power."
-
-subpackages="$pkgname-devel"
-# The following run-time dependencies are dlopen(3)ed.
-