diff --git a/.gitignore b/.gitignore
index 95cea98..06fbb3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,8 @@ highlight-3.1-beta2.tar.bz2
 =======
 /highlight-3.11-beta.tar.bz2
 /highlight-3.12.tar.bz2
+<<<<<<< HEAD
 >>>>>>> 20ea8b5... New upstream release
+=======
+/highlight-3.13.tar.bz2
+>>>>>>> 33efd8e... New upstream release
diff --git a/highlight-3.13-lua.patch b/highlight-3.13-lua.patch
new file mode 100644
index 0000000..f8d9606
--- /dev/null
+++ b/highlight-3.13-lua.patch
@@ -0,0 +1,31 @@
+diff -up highlight-3.13/src/gui-qt/highlight.pro.mk highlight-3.13/src/gui-qt/highlight.pro
+--- highlight-3.13/src/gui-qt/highlight.pro.mk	2013-02-19 18:43:29.139258245 +0100
++++ highlight-3.13/src/gui-qt/highlight.pro	2013-02-19 18:44:26.651647337 +0100
+@@ -31,9 +31,9 @@ unix:LIBS += -L.. -lhighlight
+ 
+ # If Lua 5.2 is not default on your system yet you have to omit 5.1 here:
+ unix {
+-    LIBS += -llua5.1
++    LIBS += -llua
+     CONFIG += link_pkgconfig
+-    PKGCONFIG += lua5.1
++    PKGCONFIG += lua
+ }
+ 
+ win32:QMAKE_POST_LINK = f:/upx/upx.exe --best ../../highlight-gui.exe
+diff -up highlight-3.13/src/makefile.mk highlight-3.13/src/makefile
+--- highlight-3.13/src/makefile.mk	2013-02-01 21:37:56.000000000 +0100
++++ highlight-3.13/src/makefile	2013-02-19 18:33:33.025879310 +0100
+@@ -34,10 +34,10 @@ INCLUDE_DIR=./include/
+ 
+ 
+ # If Lua 5.2 is not default on your system yet you have to omit 5.1:
+-LUA_CFLAGS=$(shell pkg-config --cflags lua5.1)
++LUA_CFLAGS=$(shell pkg-config --cflags lua)
+ 
+ # default lua lib
+-LUA_LIBS=$(shell pkg-config --libs lua5.1)
++LUA_LIBS=$(shell pkg-config --libs lua)
+ # luajit lib
+ #LUA_LIBS=$(shell pkg-config --libs luajit)
+ 
diff --git a/highlight.spec b/highlight.spec
index d6d99fe..16e8340 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,20 +1,19 @@
-Name:		highlight
-Summary:	Universal source code to formatted text converter
+Name:           highlight
+Summary:        Universal source code to formatted text converter
 
-Version:	3.12
-Release:	1%{?dist}
+Version:        3.13
+Release:        1%{?dist}
 
-Group:		Development/Tools
-License:	GPLv3
+Group:          Development/Tools
+License:        GPLv3
 
-URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
+URL:            http://www.andre-simon.de/
+Source0:        http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
+Patch1:         highlight-3.13-lua.patch
 
-BuildRequires:	qt-devel >= 1:4.4
+BuildRequires:  qt-devel >= 1:4.4
 BuildRequires:  lua-devel, boost-devel
-BuildRequires:	desktop-file-utils
-
-Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
+BuildRequires:  desktop-file-utils
 
 %{?filter_setup:
 %filter_from_provides /^perl(/d;
@@ -31,15 +30,15 @@ The utility offers indentation and reformatting capabilities.
 It is easily possible to create new language definitions and colour themes.
 
 %package gui
-Summary:	GUI for the hihghlight source code formatter
-Requires:	%{name} = %{version}-%{release}
+Summary:        GUI for the hihghlight source code formatter
+Requires:       %{name} = %{version}-%{release}
 
 %description gui
 A Qt-based GUI for the highlight source code formatter source.
 
 %prep
-
 %setup -q
+%patch1 -p1 -b .mk
 
 %build
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LDFLAGS=
@@ -49,8 +48,6 @@ make gui %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"  \
                          LDFLAGS=
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -64,9 +61,6 @@ desktop-file-install \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    highlight.desktop
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %{_bindir}/highlight
@@ -84,6 +78,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Tue Feb 19 2013 Jochen Schmitt <Jochen herr-schmitt de> - 3.13-1
+- New upstream release
+- Clean up SPEC file
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Sun Oct  7 2012 Jochen Schmitt <Jochen herr-schmitt de> - 3.12-1
 - New upstream release
 
diff --git a/sources b/sources
index bd71b35..147a19d 100644
--- a/sources
+++ b/sources
@@ -1,5 +1 @@
-<<<<<<< HEAD
-8b666baaf3638cc4b4f26b84816bc558  highlight-3.9.tar.bz2
-=======
-4b3f01e86a6b3fa25f3c4905a9cd63c7  highlight-3.12.tar.bz2
->>>>>>> 20ea8b5... New upstream release
+2b5e217c80c441853360926dbb7777e9  highlight-3.13.tar.bz2