diff --git a/.cvsignore b/.cvsignore
index 3747a39..e2a1804 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xlog-1.8.1.tar.gz
+xlog-2.0.tar.gz
diff --git a/sources b/sources
index ffb53b9..7520fef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-df1b8bf7bc88cf8273936a13ace8bc0d  xlog-1.8.1.tar.gz
+7daf0a83be1728dbdbed3c1b3dac5310  xlog-2.0.tar.gz
diff --git a/xlog.spec b/xlog.spec
index b653cb8..fe234df 100644
--- a/xlog.spec
+++ b/xlog.spec
@@ -1,15 +1,13 @@
 Name:           xlog
-Version:        1.8.1
-Release:        4%{?dist}
+Version:        2.0
+Release:        1%{?dist}
 Summary:        Logging program for Hamradio Operators
 
 Group:          Applications/Communications
 License:        GPLv3
 URL:            http://pg4i.chronos.org.uk/linux/%{name}.html
 Source0:        http://pg4i.chronos.org.uk/download/%{name}-%{version}.tar.gz
-Patch0:         xlog-1.8.1-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires: pkgconfig
 BuildRequires: gtk2-devel
 BuildRequires: libgnomeprint22-devel
 BuildRequires: hamlib-devel
@@ -26,17 +24,13 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files.
 
 %prep
 %setup -q
-%patch0 -p1 -b doc
 #fix bogus .desktop file
 sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
-sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
+sed -i -e "s/Utility;Database;HamRadio;GTK/HamRadio;/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
 
 %build
-#missing directory from package
-mkdir m4
-autoreconf -i -f
-%configure --enable-hamlib
+%configure --enable-hamlib --docdir=%{_docdir}/%{name}-%{version}
 make %{?_smp_mflags}
 
 
@@ -66,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang 
 %defattr(-,root,root,-)
-%doc AUTHORS BUGS ChangeLog COPYING NEWS README data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
+%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/doc/manual.tex data/glabels/qsllabels.glabels
 %{_bindir}/%{name}
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/dxcc
@@ -80,6 +74,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Feb 17 2009 Lucian Langa <cooly@gnome.eu.org> - 2.0-1
+- add --docdir option
+- remove m4 creation
+- drop patch0 (fixed upstream)
+- new upstream release
+
 * Wed Dec 10 2008 Lucian Langa <cooly@gnome.eu.org> - 1.8.1-4
 - modify patch to correctly display documentation