diff --git a/vlc.changes b/vlc.changes
index ed70b35..a459051 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 24 12:28:32 UTC 2015 - dimstar@opensuse.org
+
+- Fix build with LUA 5.3 / 5.3.1.
+
 -------------------------------------------------------------------
 Fri May 15 10:11:17 UTC 2015 - joerg.lorenzen@ki.tng.de
 
@@ -6,7 +11,7 @@ Fri May 15 10:11:17 UTC 2015 - joerg.lorenzen@ki.tng.de
 -------------------------------------------------------------------
 Wed May 13 15:46:45 UTC 2015 - aloisio@gmx.com
 
-- Enabled Qt5 for targets that support it. 
+- Enabled Qt5 for targets that support it.
 
 -------------------------------------------------------------------
 Fri May  1 18:22:44 UTC 2015 - jengelh@inai.de
@@ -16,7 +21,7 @@ Fri May  1 18:22:44 UTC 2015 - jengelh@inai.de
 -------------------------------------------------------------------
 Tue Apr 28 19:30:49 UTC 2015 - tittiatcoke@gmail.com
 
-- Regenerate the cache for all packages that install plugins. 
+- Regenerate the cache for all packages that install plugins.
   This otherwise would cause issues during the switch from Qt4-Qt5
 
 -------------------------------------------------------------------
diff --git a/vlc.spec b/vlc.spec
index 6096b31..31c0439 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -96,8 +96,8 @@ BuildRequires:  libtheora-devel >= 1.0
 BuildRequires:  libtool
 BuildRequires:  libudev-devel >= 142
 BuildRequires:  libvorbis-devel >= 1.1
-BuildRequires:  libxml2-devel >= 2.5
 BuildRequires:  libvpx-devel
+BuildRequires:  libxml2-devel >= 2.5
 BuildRequires:  lirc-devel
 BuildRequires:  live555-devel >= 2015.01.27
 BuildRequires:  lua-devel >= 5.1
@@ -309,6 +309,17 @@ date
 %endif
 %endif
 
+### Fix up sources for LUA 5.3
+if pkg-config --atleast-version 5.3 lua; then
+  sed -i 's/luaL_optint/(int)&eger/'         modules/lua/libs/{net,osd,volume}.c
+fi
+
+### And LUA 5.3.1 has some more API changes
+if pkg-config --atleast-version 5.3.1 lua; then
+  sed -i 's/luaL_checkint(/(int)luaL_checkinteger(/' \
+    modules/lua/{demux,libs/{configuration,net,osd,playlist,stream,variables,volume}}.c
+fi
+
 # We do not rely on contrib but make use of system libraries
 rm -rf contrib
 # fix builddate info