diff --git a/.cvsignore b/.cvsignore
index a5db4bd..d12c98b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-enblend-enfuse-3.2.tar.gz
+enblend-enfuse-4.0.tar.gz
diff --git a/enblend-gcc43.patch b/enblend-gcc43.patch
deleted file mode 100644
index 2731836..0000000
--- a/enblend-gcc43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -u -r enblend-enfuse-3.1-orig/include/vigra/imageiteratoradapter.hxx enblend-enfuse-3.1/include/vigra/imageiteratoradapter.hxx
---- enblend-enfuse-3.1-orig/include/vigra/imageiteratoradapter.hxx	2007-01-26 20:00:34.000000000 -0900
-+++ enblend-enfuse-3.1/include/vigra/imageiteratoradapter.hxx	2008-04-07 14:15:58.000000000 -0800
-@@ -39,6 +39,7 @@
- #define VIGRA_IMAGEITERATORADAPTER_HXX
- 
- #include <iterator>   // iterator tags
-+#include <cstdlib>
- 
- namespace vigra {
- 
-diff -u -r enblend-enfuse-3.1-orig/src/gpu.cc enblend-enfuse-3.1/src/gpu.cc
---- enblend-enfuse-3.1-orig/src/gpu.cc	2007-08-05 00:30:17.000000000 -0800
-+++ enblend-enfuse-3.1/src/gpu.cc	2008-04-07 14:23:06.000000000 -0800
-@@ -19,7 +19,7 @@
-  */
- 
- #include <iostream>
--
-+#include <cstdlib>
- #include "gpu.h"
- #ifdef HAVE_LIBGLEW
- 
diff --git a/enblend.spec b/enblend.spec
index dd14f72..88d43e1 100644
--- a/enblend.spec
+++ b/enblend.spec
@@ -1,7 +1,7 @@
 Summary: Image Blending with Multiresolution Splines
 Name: enblend
-Version: 3.2
-Release: 4%{?dist}
+Version: 4.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/enblend/enblend-enfuse-%{version}.tar.gz
@@ -9,15 +9,25 @@ URL: http://enblend.sourceforge.net/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtiff-devel boost-devel lcms-devel plotutils-devel
 BuildRequires: freeglut-devel glew-devel libjpeg-devel libpng-devel OpenEXR-devel
-BuildRequires: libXmu-devel libXi-devel
+Buildrequires: transfig gnuplot tidy
+
+%if 0%{?fedora} >= 9
+BuildRequires: libXmu-devel libXi-devel 
+%endif
+%if 0%{?rhl} >= 4
+BuildRequires: xorg-x11-devel
+%endif
+
 Requires(post): info
 Requires(preun): info
 
 %description
-Enblend is a tool for compositing images. Given a set of images that overlap in
+Enblend is a tool for compositing images, given a set of images that overlap in
 some irregular way, Enblend overlays them in such a way that the seam between
-the images is invisible, or at least very difficult to see. Enblend does not
-line up the images for you. Use a tool like hugin to do that.
+the images is invisible, or at least very difficult to see.  Enfuse combines
+multiple images of the same subject into a single image with good exposure and
+good focus.  Enblend and Enfuse do not line up the images for you, use a tool
+like Hugin to do that.
 
 %prep
 %setup -q -n enblend-enfuse-%{version}
@@ -36,26 +46,30 @@ rm -rf %{buildroot}
 
 %post
 /sbin/install-info %{_infodir}/enblend.info %{_infodir}/dir || :
-/sbin/install-info %{_infodir}/enfuse-focus-stacking.info %{_infodir}/dir || :
 /sbin/install-info %{_infodir}/enfuse.info %{_infodir}/dir || :
 
 %preun
 if [ $1 = 0 ] ; then
   /sbin/install-info --delete %{_infodir}/enblend.info %{_infodir}/dir || :
-  /sbin/install-info --delete %{_infodir}/enfuse-focus-stacking.info %{_infodir}/dir || :
   /sbin/install-info --delete %{_infodir}/enfuse.info %{_infodir}/dir || :
 fi
 
 %files
 %defattr(-, root, root)
-%doc AUTHORS ChangeLog COPYING INSTALL NEWS README TODO VIGRA_LICENSE
+
+%doc AUTHORS COPYING INSTALL NEWS README VIGRA_LICENSE
+
 %{_bindir}/enblend
 %{_bindir}/enfuse
-%{_mandir}/man1/enblend.1.gz
-%{_mandir}/man1/enfuse.1.gz
-%{_infodir}/*.info.gz
+%{_mandir}/man1/*
+%{_infodir}/enblend.*
+%{_infodir}/enfuse.*
+
 
 %changelog
+* Fri Feb 05 2010 Bruno Postle <bruno@postle.net> - 4.0-1
+- Fixes for push to fedora
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 5e6208c..a07bd93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9b6ebaf672f5103c633a53c9723d99c3  enblend-enfuse-3.2.tar.gz
+2e7c950061e0085fd75d94576130250f  enblend-enfuse-4.0.tar.gz