diff --git a/.cvsignore b/.cvsignore
index c2cd84f..0e69a80 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-kchmviewer-3.1.tar.gz
+kchmviewer-4.0beta2.tar.gz
diff --git a/kchmviewer.spec b/kchmviewer.spec
index 038f89d..0bcfc4a 100644
--- a/kchmviewer.spec
+++ b/kchmviewer.spec
@@ -1,58 +1,65 @@
 Name:           kchmviewer
-Version:        3.1
-Release:        1%{?dist}.5
-Summary:        CHM viewer with KDE support
+Version:        4.0
+Release:        0.1.beta2%{?dist}
+Summary:        CHM viewer with Qt support
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://www.kchmviewer.net/
-Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/kchmviewer/kchmviewer-%{version}beta2.tar.gz
 # fix the desktop file
 Patch0:         kchmviewer-2.0-desktop_fix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel chmlib-devel 
-BuildRequires:  desktop-file-utils kdelibs-devel
+BuildRequires:  qt4-devel chmlib-devel 
+BuildRequires:  desktop-file-utils kdelibs4-devel
 
 %description
 KchmViewer is a chm (MS HTML help file format) viewer, written in C++. 
-Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget 
-library. It is compiled with full KDE support, including KDE widgets 
-and KIO/KHTML.
+It uses the Qt widget library. 
+#It is compiled with full KDE support, including KDE widgets 
+#and KIO/KHTML.
 
 
 %prep
-%setup -q
+%setup -q -n kchmviewer-%{version}beta2
 %patch0 -p1 -b .desktop_fix
-chmod -x lib/kio-msits/msits.*
 
+iconv -f latin1 -t utf8 < FAQ > FAQ.utf8
+touch -r FAQ FAQ.utf8
+mv FAQ.utf8 FAQ
+
+#chmod -x lib/kio-msits/msits.*
 
-%build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
-[ -n "$QTLIB" ] || export QTLIB="$QTDIR/lib"
-[ -n "$QTINC" ] || export QTINC="$QTDIR/include"
 
-%configure --disable-static --with-kde --disable-rpath \
- --disable-dependency-tracking --disable-strict --disable-warnings
+%build
+qmake-qt4
 make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
-install -p -m644 src/pics/cr48-app-kchmviewer.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/kchmviewer.png
-
+# no install target
+#make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+install -m0755 bin/kchmviewer $RPM_BUILD_ROOT%{_bindir}
+# to be done automatically when kde support is reenabled
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+for r in 48 64 128; do
+  mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/
+  install -p -m644 src/pics/cr${r}-app-kchmviewer.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${r}x${r}/apps/kchmviewer.png
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora                            \
-        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --delete-original \
-        $RPM_BUILD_ROOT%{_datadir}/applications/kchmviewer.desktop
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+        lib/kio-msits/kchmviewer.desktop
 
 # remove static libs, they have no interface, libkdeextra is too generic
-rm ${RPM_BUILD_ROOT}%{_libdir}/libchmfile.a 
-rm ${RPM_BUILD_ROOT}%{_libdir}/libkdeextra.a
+#rm ${RPM_BUILD_ROOT}%{_libdir}/libchmfile.a 
+#rm ${RPM_BUILD_ROOT}%{_libdir}/libkdeextra.a
 
-%find_lang %{name}
+#%%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,28 +67,37 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/crystalsvg || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+#touch --no-create %{_datadir}/icons/crystalsvg || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 %postun
 update-desktop-database &> /dev/null ||:
-touch --no-create %{_datadir}/icons/crystalsvg || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+#touch --no-create %{_datadir}/icons/crystalsvg || :
+#%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 
 
-%files -f %{name}.lang
+#-f %{name}.lang
+%files 
 %defattr(-,root,root,-)
-%doc README COPYING ChangeLog
+%doc README COPYING ChangeLog FAQ
 %{_bindir}/kchmviewer
 %{_datadir}/applications/*
-%{_datadir}/pixmaps/*
-%{_libdir}/kde3/kio_msits.so
-%{_libdir}/kde3/kio_msits.la
-%{_datadir}/services/msits.protocol
-%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
+#%{_datadir}/pixmaps/*
+#%{_libdir}/kde3/kio_msits.so
+#%{_libdir}/kde3/kio_msits.la
+#%{_datadir}/services/msits.protocol
+#%{_datadir}/icons/crystalsvg/*/apps/kchmviewer.png
+%{_datadir}/icons/hicolor/*/apps/kchmviewer.png
 
 
 %changelog
+* Thu Feb 14 2008 Patrice Dumas <pertusus@free.fr> 4.0-0.1.beta2
+- update to 4.0beta2
+
 * Thu Aug  2 2007 Patrice Dumas <pertusus@free.fr> 3.1-1.5
 - update to 3.1
 
diff --git a/sources b/sources
index ce34441..34abd74 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6666e32415e0e91f963190a25d5767fb  kchmviewer-3.1.tar.gz
+a81d8f84458824b93ab788083ecd2120  kchmviewer-4.0beta2.tar.gz