diff --git a/krusader-2.0.0-beta2.tar.bz2 b/krusader-2.0.0-beta2.tar.bz2
deleted file mode 100644
index 3717c18..0000000
--- a/krusader-2.0.0-beta2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b1bbdb27c28ec4cf1870e9e97a3a68e961fa5daadd51e9ffca2bfcd0d38794ea
-size 3458151
diff --git a/krusader-2.0.0.tar.bz2 b/krusader-2.0.0.tar.bz2
new file mode 100644
index 0000000..f2791b3
--- /dev/null
+++ b/krusader-2.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ef6a314cd9b8592b0d131825d79185ec291ae8e619f6a8ad687c01b0ff582c8
+size 3591948
diff --git a/krusader.changes b/krusader.changes
index 3bc9b4d..d9b2bd3 100644
--- a/krusader.changes
+++ b/krusader.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat May  2 20:32:29 CEST 2009 - dmueller@suse.de
+
+- review/merge to openSUSE Factory
+
+-------------------------------------------------------------------
+Sat Apr 18 12:16:01 CET 2009 - bitshuffler #suse@irc.freenode.org
+
+- Updated to 2.0.0
+
 -------------------------------------------------------------------
 Sat Mar 21 10:34:23 CET 2009 - beineri@opensuse.org
 
diff --git a/krusader.spec b/krusader.spec
index 30d5517..4e53f72 100644
--- a/krusader.spec
+++ b/krusader.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package krusader (Version 1.99.2.svn6248)
+# spec file for package krusader (Version 2.0.0)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,20 +17,21 @@
 
 # norootforbuild
 
+%define jobs $(( `/usr/bin/getconf _NPROCESSORS_ONLN` + 1 ))
 
 Name:           krusader
-BuildRequires:  libkde4-devel update-desktop-files
-Url:            http://krusader.sourceforge.net/
+Version:        2.0.0
+Release:        1
 License:        GPL v2 or later
 Group:          Productivity/File utilities
-Summary:        A File Manager
-Version:        1.99.2.svn6248
-Release:        1
-Requires:       kio_iso = %version
+Url:            http://krusader.sourceforge.net/
+Source:         %{name}-%{version}.tar.bz2
+Patch:          FIXME.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        krusader-2.0.0-beta2.tar.bz2
-Patch:          trunk.diff.bz2
-Patch1:         FIXME.diff
+BuildRequires:  dos2unix fdupes libkde4-devel update-desktop-files
+Requires:       kio_iso = %{version}
+Recommends:     %{name}-doc
+Summary:        A File Manager
 %kde4_runtime_requires
 
 %description
@@ -60,11 +61,29 @@ Authors:
 --------
     Szombathelyi Gygy <gyurco@users.sourceforge.net>
 
+%package doc
+License:        GPL v2 or later
+Group:          Productivity/File utilities
+Summary:        A File Manager
+
+%description doc
+An advanced twin panel (commander style) file manager for KDE.
+
+
+
+Authors:
+--------
+    Shie Erlich <krusader@users.sourceforge.net>
+    Rafi Yanai  <krusader@users.sourceforge.net>
+
 %prep
-%setup -n krusader-2.0.0-beta2
-%patch -p1
-%patch1
+%setup -q
+%patch
 mv po/sr\@Latn.po po/sr\@latin.po
+for file in doc/en/*.docbook;
+do
+	dos2unix $file
+done
 
 %build
 %cmake_kde4 -d build
@@ -76,9 +95,10 @@ pushd build
 %kde_post_install
 popd
 %find_lang %{name}
+%fdupes %{buildroot}
 
 %clean
-%__rm -rf %{buildroot}
+test "%{buildroot}" != "/" && %__rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -87,21 +107,29 @@ popd
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README AUTHORS COPYING ChangeLog INSTALL TODO SVNNEWS
-%_bindir/krusader
-%doc %lang(en) /usr/share/doc/kde/HTML/en/krusader
-%_kde_share_dir/apps/krusader
-%_kde_share_dir/services/krarc.protocol
-%_kde4_modules/kio_krarc.so
-/usr/share/applications/kde4/krusader*.desktop
-/usr/share/icons/??color/*/apps/krusader*.png
+%{_bindir}/krusader
+%exclude %{_datadir}/doc/kde/HTML/en/krusader
+%{_kde_share_dir}/apps/krusader
+%{_kde_share_dir}/services/krarc.protocol
+%{_kde4_modules}/kio_krarc.so
+%{_datadir}/applications/kde4/krusader*.desktop
+%{_datadir}/icons/??color/*/apps/krusader*.png
 
 %files -n kio_iso
 %defattr(-,root,root)
-%config /usr/share/kde4/config/kio_isorc
-%_kde4_modules/kio_iso.so*
-%_kde_share_dir/services/iso.protocol
+%config %{_datadir}/kde4/config/kio_isorc
+%{_kde4_modules}/kio_iso.so*
+%{_kde_share_dir}/services/iso.protocol
+
+%files doc
+%defattr(-,root,root)
+%doc %lang(en) %{_datadir}/doc/kde/HTML/en/krusader
 
 %changelog
+* Sat May 02 2009 dmueller@suse.de
+- review/merge to openSUSE Factory
+* Sat Apr 18 2009 bitshuffler #suse@irc.freenode.org
+- Updated to 2.0.0
 * Sat Mar 21 2009 beineri@opensuse.org
 - added SVN trunk diff:
   * archive dialog now remembers compression level
@@ -250,7 +278,7 @@ popd
 - added openssl-devel to neededforbuild
 * Tue Mar 27 2001 ro@suse.de
 - changed neededforbuild <docbkdsl> to <docbook-dsssl-stylesheets>
-* Sun Mar 18 2001 ro@suse.de
+* Mon Mar 19 2001 ro@suse.de
 - fixed neededforbuild
 * Tue Mar 13 2001 ro@suse.de
 - changed neededforbuild <docbk30> to <docbook_3>
diff --git a/trunk.diff.bz2 b/trunk.diff.bz2
deleted file mode 100644
index 226ee8c..0000000
--- a/trunk.diff.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e406aad223a633f6ebf0bcff88e7af347a78dfb4826914673ba8d9d5fa7edde3
-size 205987