diff --git a/kdiff3.changes b/kdiff3.changes
index b86625a..f915e03 100644
--- a/kdiff3.changes
+++ b/kdiff3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  8 10:10:17 UTC 2010 - coolo@novell.com
+
+- do not package docs in both subpackages
+
 -------------------------------------------------------------------
 Wed May 20 12:08:02 CEST 2009 - beineri@opensuse.org
 
diff --git a/kdiff3.spec b/kdiff3.spec
index ff20a06..9593ea1 100644
--- a/kdiff3.spec
+++ b/kdiff3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kdiff3 (Version 0.9.95)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,12 +26,12 @@ BuildRequires:  update-desktop-files
 %if %suse_version > 1020
 BuildRequires:  fdupes
 %endif
-License:        GPL v2 or later
+License:        GPLv2+
 Url:            http://kdiff3.sourceforge.net/
 Group:          Development/Tools/Version Control
 Summary:        Feature-Rich Code Comparison Utility
 Version:        0.9.95
-Release:        2
+Release:        3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        %{name}-%{version}.tar.bz2
 %kde4_runtime_requires
@@ -87,66 +87,7 @@ rm $RPM_BUILD_ROOT/usr/share/doc/kde/HTML/*/kdiff3/common
 %_datadir/kde4/apps/kdiff3/kdiff3_part.rc
 %_datadir/kde4/services/kdiff3part.desktop
 %_datadir/kde4/apps/kdiff3
-%_datadir/doc/kde/HTML/*
 
 %files lang -f %name.lang
 
 %changelog
-* Wed May 20 2009 beineri@opensuse.org
-- require kdiff3-lang
-* Fri Mar 06 2009 wstephenson@suse.de
-- update to 0.9.95:
-  * Show line end style for each file
-  * Translation update
-  * Bugfixes
-* Fri Feb 20 2009 dmueller@suse.de
-- update to 0.9.94:
-  * ported to KDE4
-  * various smaller fixes
-* Sat Feb 14 2009 coolo@suse.de
-- call kde_post_install
-* Mon Nov 17 2008 stbinner@suse.de
-- install translations for kdiff3 menu plugin (bnc#442527)
-* Wed Jun 13 2007 stbinner@suse.de
-- running fdupes makes kdiff3.rpm 348KB smaller
-* Sun Apr 15 2007 stbinner@suse.de
-- update to version 0.9.92:
-  * KDE-Konqueror plugin: Launch KDiff3 from Konqueror.
-  * Temp file names use process id in file name for several instances.
-  * New File comparison mode: Trust the size and date, but use
-  binary comparison if date doesn't match (unsafe)
-  * Open dialog also shows current dirs in directory comparison mode.
-  * New option for history merge: Max number of history entries
-  * New option "Auto save and quit on merge without conflicts"
-  * Several Bugfixes
-* Sun Nov 05 2006 stbinner@suse.de
-- update to version 0.9.91:
-  * Unicode autodetection based on byte-order-mark.
-  * Fix for crash after double click below last line
-  * Saving of maximized window-state (Patch by Robert Vock)
-  * Separated Merge-options in own tab
-  * When pasting multiple lines into openfile dialog only first
-  line is kept
-  * Drawing in directory view fixed.
-  * When specifying a separate output dir then for equal files a
-  copy operation will also be offered.
-* Wed May 24 2006 adrian@suse.de
-- fix build for < 10.1
-* Tue May 16 2006 stbinner@suse.de
-- update to version 0.9.90
-  * Fixed KIO-problems of type "File exists" with tempfiles.
-  * Fix for manual alignment with 3 files which caused crash.
-  * Preserve executable bit when overwriting an existing file.
-  * Documentation and translations updated.
-* Mon Apr 10 2006 stbinner@suse.de
-- update to version 0.9.89
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Oct 25 2005 stbinner@suse.de
-- update to version 0.9.88 (unicode support)
-* Thu Feb 17 2005 adrian@suse.de
-- menu entry moved to xdg dir
-* Sat Sep 04 2004 coolo@suse.de
-- fixing Makefile problems
-* Sat Aug 28 2004 adrian@suse.de
-- initial package of version 0.9.86