diff --git a/_multibuild b/_multibuild
new file mode 100644
index 0000000..b9bdec1
--- /dev/null
+++ b/_multibuild
@@ -0,0 +1,5 @@
+<multibuild>
+<package>lua51</package>
+<package>lua52</package>
+<package>lua53</package>
+</multibuild>
diff --git a/lua-lpeg.changes b/lua-lpeg.changes
index 597443a..fea0ffe 100644
--- a/lua-lpeg.changes
+++ b/lua-lpeg.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul 13 16:12:32 UTC 2017 - tchvatal@suse.com
+
+- Switch to multibuild spec for all lua versions
+
 -------------------------------------------------------------------
 Fri Feb 17 07:34:12 UTC 2017 - callumjfarmer13@gmail.com
 
diff --git a/lua-lpeg.spec b/lua-lpeg.spec
index 4bd90e0..0134a1c 100644
--- a/lua-lpeg.spec
+++ b/lua-lpeg.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package lua-lpeg
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,10 @@
 #
 
 
+%define flavor @BUILD_FLAVOR@
+%define _name lgi
 %define mod_name lpeg
-Name:           lua-%{mod_name}
+Name:           %{flavor}-%{mod_name}
 Version:        1.0.1
 Release:        0
 Summary:        Parsing Expression Grammars For Lua
@@ -25,9 +27,13 @@ License:        MIT
 Group:          Development/Libraries/Other
 Url:            http://www.inf.puc-rio.br/~roberto/lpeg
 Source:         http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-%{version}.tar.gz
-BuildRequires:  lua-devel
-Requires:       lua
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  %{flavor}-devel
+Requires:       %{flavor}
+Provides:       %{flavor}-LPeg = %{version}
+Obsoletes:      %{flavor}-LPeg < %{version}
+%if "%{flavor}" == ""
+ExclusiveArch:  do_not_build
+%endif
 
 %description
 LPeg is a new pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).
@@ -46,6 +52,7 @@ generated by luadoc or ldoc.
 
 # Set our cflags
 sed -i \
+    -e 's:../lua/:%{lua_incdir}:' \
     -e 's: -O2: %{optflags}:g' \
     makefile
 
@@ -60,12 +67,10 @@ mkdir -p %{buildroot}%{lua_archdir}
 install lpeg.so %{buildroot}%{lua_archdir}
 
 %files
-%defattr(-,root,root,-)
 %dir %{lua_archdir}
 %{lua_archdir}/*
 
 %files doc
-%defattr(-,root,root,-)
 %doc re.html lpeg.html HISTORY
 
 %changelog