diff --git a/highlight-3.0beta-make.patch b/highlight-3.0beta-make.patch
deleted file mode 100644
index 3a223b7..0000000
--- a/highlight-3.0beta-make.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up highlight-3.0-beta/makefile.org highlight-3.0-beta/makefile
---- highlight-3.0-beta/makefile.org	2010-06-09 20:06:16.241377932 +0200
-+++ highlight-3.0-beta/makefile	2010-06-09 20:07:59.600387611 +0200
-@@ -66,10 +66,10 @@ install:
- 	${MKDIR} ${DESTDIR}${doc_dir}
- 	${MKDIR} ${DESTDIR}${conf_dir}
- 	${MKDIR} ${DESTDIR}${examples_dir} \
--		${DESTDIR}${examples_dir}web_plugins \
--		${DESTDIR}${examples_dir}web_plugins/dokuwiki \
--		${DESTDIR}${examples_dir}web_plugins/movabletype \
--		${DESTDIR}${examples_dir}web_plugins/wordpress \
-+		${DESTDIR}${examples_dir}plugins \
-+		${DESTDIR}${examples_dir}plugins/dokuwiki \
-+		${DESTDIR}${examples_dir}plugins/movabletype \
-+		${DESTDIR}${examples_dir}plugins/wordpress \
- 		${DESTDIR}${examples_dir}swig
- 	${MKDIR} ${DESTDIR}${data_dir} \
- 		${DESTDIR}${data_dir}themes \
diff --git a/highlight.spec b/highlight.spec
index cee233f..4bf1b01 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,16 +1,17 @@
+%global betaver 2
+%global bdir %{name}-%{version}-beta%{betaver}
+
 Name:		highlight
 Summary:	Universal source code to formatted text converter
+
 Version:	3.1
-Release:	0.1%{?dist}
+Release:	0.2%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}-beta.tar.bz2
-
-# Patch sent to upstream via email
-Patch1:		highlight-3.0beta-make.patch
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}-beta%{betaver}.tar.bz2
 
 BuildRequires:	qt-devel >= 4.4
 BuildRequires:  lua-devel, boost-devel
@@ -35,15 +36,14 @@ A Qt-based GUI for the highlight source code formatter source.
 
 %prep
 
-%setup -q -n %{name}-%{version}-beta
-%patch1 -p1 -b .org
+%setup -q -n %{bdir}
 
 # Provides: exclude perl(highlight_pipe) from example
 cat <<__EOF__ > %{name}-perl.prov
 #!/bin/sh
 /usr/lib/rpm/perl.prov \$* | grep -v '^perl(highlight_pipe)$'
 __EOF__
-%define __perl_provides %{_builddir}/%{name}-%{version}-beta/%{name}-perl.prov
+%define __perl_provides %{_builddir}/%{bdir}/%{name}-perl.prov
 chmod +x %{__perl_provides}
 
 # Requires: exclude all perl related req. from example
@@ -51,7 +51,7 @@ cat <<__EOF__ > %{name}-perl.req
 #!/bin/sh
 /usr/lib/rpm/perl.req \$* | grep -v '^perl('
 __EOF__
-%define __perl_requires %{_builddir}/%{name}-%{version}-beta/%{name}-perl.req
+%define __perl_requires %{_builddir}/%{bdir}/%{name}-perl.req
 chmod +x %{__perl_requires}
 
 %build
@@ -102,6 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
+* Thu Jul 15 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.1-0.2
+- New upstream release
+
 * Sat Jun 26 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.1-0.1
 - New upstream release