diff --git a/.cvsignore b/.cvsignore
index 0549a1b..7d5b2bf 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-highlight-2.16.tar.bz2
+highlight-3.0-beta.tar.bz2
diff --git a/highlight-3.0beta-make.patch b/highlight-3.0beta-make.patch
new file mode 100644
index 0000000..3a223b7
--- /dev/null
+++ b/highlight-3.0beta-make.patch
@@ -0,0 +1,18 @@
+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 89f3236..2797bb9 100644
--- a/highlight.spec
+++ b/highlight.spec
@@ -1,15 +1,19 @@
 Name:		highlight
 Summary:	Universal source code to formatted text converter
-Version:	2.16
-Release:	1%{?dist}
+Version:	3.0
+Release:	0.1%{?dist}
 
 Group:		Development/Tools
 License:	GPLv3
 
 URL:		http://www.andre-simon.de/
-Source0:	http://www.andre-simon.de/zip/%{name}-%{version}.tar.bz2
+Source0:	http://www.andre-simon.de/zip/%{name}-%{version}-beta.tar.bz2
+
+# Patch sent to upstream via email
+Patch1:		highlight-3.0beta-make.patch
 
 BuildRequires:	qt-devel >= 4.4
+BuildRequires:  lua-devel, boost-devel
 BuildRequires:	desktop-file-utils
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
@@ -30,14 +34,19 @@ Requires:	%{name} = %{version}-%{release}
 A Qt-based GUI for the highlight source code formatter source.
 
 %prep
+<<<<<<< highlight.spec
+%setup -q -n %{name}-%{version}-beta
+%patch1 -p1 -b .org
+=======
 %setup -q
+>>>>>>> 1.54
 
 # 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}/%{name}-perl.prov
+%define __perl_provides %{_builddir}/%{name}-%{version}-beta/%{name}-perl.prov
 chmod +x %{__perl_provides}
 
 # Requires: exclude perl(IPC::Open3) from example
@@ -45,7 +54,7 @@ cat <<__EOF__ > %{name}-perl.req
 #!/bin/sh
 /usr/lib/rpm/perl.req \$* | grep -v '^perl(IPC::Open3)$'
 __EOF__
-%define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-perl.req
+%define __perl_requires %{_builddir}/%{name}-%{version}-beta/%{name}-perl.req
 chmod +x %{__perl_requires}
 
 %build
@@ -96,7 +105,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/highlight.xpm
 
 %changelog
-* Mon Apr  5 2010 Jochen Schmitt <s4504kr@omega> 2.16-1
+* Thu Jun 10 2010 Jochen Schmitt <Jochen herr-schmitt de> 3.0-0.1
+- New upstream release (beta)
+
+* Mon Apr  5 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.16-1
 - New upstream release
 
 * Sun Mar 14 2010 Jochen Schmitt <Jochen herr-schmitt de> 2.15-2
diff --git a/sources b/sources
index 59f78b7..c9cf9b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-08f1429a6db258ab1a7eecbb4e0d44b2  highlight-2.16.tar.bz2
+7c4ba2a9ae6ab3cf2adfa0763ee17edb  highlight-3.0-beta.tar.bz2