diff --git a/stellarium.spec b/stellarium.spec
index 0aefb7e..945dd28 100644
--- a/stellarium.spec
+++ b/stellarium.spec
@@ -1,5 +1,7 @@
 Name:           stellarium
-Version:        0.9.0
+<<<<<<< stellarium.spec
+Version:        0.9.1
+Release:        1%{?dist}
 Release:        7%{?dist}
 Summary:        Photo-realistic nightsky renderer
 
@@ -9,8 +11,7 @@ URL:            http://stellarium.free.fr/
 Source0:        http://switch.dl.sf.net/stellarium/stellarium-%{version}.tar.gz
 Source1:        stellarium.desktop
 Source2:        http://switch.dl.sf.net/stellarum/stellarium_user_guide-0.9.0-1.pdf
-Patch1:		stellarium-0.9.0-cmake.patch
-Patch2:		stellarium-0.9.0-tm.patch
+Patch1:		stellarium-0.9.1-cmake.patch
 Patch3:		stellarium-0.9.0-gcc43.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -24,6 +25,7 @@ BuildRequires:	cmake
 BuildRequires:	qt4-devel
 BuildRequires:	gettext-devel
 BuildRequires:	boost-devel
+BuildRequires:	glib2-devel
 
 Requires:	opengl-games-utils
 
@@ -45,9 +47,14 @@ You will need a PDF viewer to read the user guide.
 
 %prep
 %setup -q
+<<<<<<< stellarium.spec
+%patch1 -p1 -b .cm
+%patch3 -p1 -b .gcc43
+=======
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+>>>>>>> 1.35
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -78,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc AUTHORS ChangeLog COPYING README 
 %{_bindir}/stellarium
 %{_bindir}/stellarium-wrapper
 %{_datadir}/%{name}
@@ -90,6 +97,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING stellarium_user_guide-0.9.0-1.pdf
 
 %changelog
+<<<<<<< stellarium.spec
+* Tue Jan 22 2008 Jochen Schmitt <Jochen herr-schmitt de> 0.9.1-1
+- New upstream release
+
 * Thu Jan 03 2008 Lubomir Kundrak <lkundrak@redhat.com> 0.9.0-7
 - Adding missing includes to fix build with gcc-4.3
 - Corrected License tag of -doc subpackage