diff --git a/.cvsignore b/.cvsignore
index a1c534b..58dea30 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wine-0.9.39-fe.tar.bz2
+wine-0.9.40-fe.tar.bz2
diff --git a/sources b/sources
index f7af00b..a071585 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4549b9643c8d858fc5c77cfe95d626c7  wine-0.9.39-fe.tar.bz2
+746ae59ce3dc9634acc3a0b5967ec472  wine-0.9.40-fe.tar.bz2
diff --git a/wine-rpath.patch b/wine-rpath.patch
index 288a503..24dbb9f 100644
--- a/wine-rpath.patch
+++ b/wine-rpath.patch
@@ -1,6 +1,6 @@
---- configure.orig	2007-05-23 10:59:34.000000000 +0200
-+++ configure	2007-05-23 11:02:05.000000000 +0200
-@@ -13596,14 +13596,14 @@
+--- configure.orig	2007-07-03 14:31:05.000000000 +0200
++++ configure	2007-07-03 14:37:20.000000000 +0200
+@@ -13606,14 +13606,14 @@
  fi
  
  
@@ -19,25 +19,53 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13653,7 +13653,7 @@
+@@ -13663,17 +13663,17 @@
  	       { echo "$as_me:$LINENO: result: $ac_res" >&5
  echo "${ECHO_T}$ac_res" >&6; }
  if test `eval echo '${'$as_ac_var'}'` = yes; then
--  LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
-+  LIBWINE_LDFLAGS=""
+-  LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+-                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
++  LDRPATH_INSTALL=""
++                       LDRPATH_LOCAL=""
  else
-   as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
---- configure.ac.orig	2007-05-23 10:59:39.000000000 +0200
-+++ configure.ac	2007-05-23 11:02:39.000000000 +0200
-@@ -1031,11 +1031,6 @@
+-  as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+-echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... $ECHO_C" >&6; }
++  as_ac_var=`echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
++echo $ECHO_N "checking whether the compiler supports -fPIC $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_wine_try_cflags_saved=$CFLAGS
+-CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
++CFLAGS="$CFLAGS -fPIC"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -13723,8 +13723,8 @@
+ 	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+-  LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+-                            LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
++  LDRPATH_INSTALL=""
++                            LDRPATH_LOCAL=""
+ fi
+ 
+ fi
+--- configure.ac.orig	2007-07-03 14:37:34.000000000 +0200
++++ configure.ac	2007-07-03 14:37:59.000000000 +0200
+@@ -1006,13 +1006,6 @@
        WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
                        [AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
  
 -      WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
--                      [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"],
+-                      [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+-                       LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
 -          [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
--                           [LIBWINE_LDFLAGS="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])])
+-                           [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+-                            LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
 -
        case $host_cpu in
          *i[[3456789]]86* | x86_64)
diff --git a/wine.spec b/wine.spec
index 7cf295c..bbc1872 100644
--- a/wine.spec
+++ b/wine.spec
@@ -1,6 +1,6 @@
 Name:		wine
-Version:	0.9.39
-Release:	2%{?dist}
+Version:	0.9.40
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
@@ -18,7 +18,7 @@ URL:		http://www.winehq.org/
 # Makefile.in:dlls/winemp3.acm/Makefile: dlls/winemp3.acm/Makefile.in dlls/Makedll.rules
 # programs/winecfg/libraries.c:    "winemp3.acm",
 
-Source0:        wine-0.9.39-fe.tar.bz2
+Source0:        wine-0.9.40-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -462,6 +462,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/dpnhpast.dll.so
 %{_libdir}/wine/dsound.dll.so
 %{_libdir}/wine/dswave.dll.so
+%{_libdir}/wine/dwmapi.dll.so
 %{_libdir}/wine/dxdiagn.dll.so
 %{_libdir}/wine/eject.exe.so
 %{_libdir}/wine/gdi.exe16
@@ -472,6 +473,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/hid.dll.so
 %{_libdir}/wine/hh.exe.so
 %{_libdir}/wine/hlink.dll.so
+%{_libdir}/wine/hnetcfg.dll.so
 %{_libdir}/wine/hhctrl.ocx.so
 %{_libdir}/wine/iccvid.dll.so
 %{_libdir}/wine/icinfo.exe.so
@@ -533,6 +535,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/newdev.dll.so
 %{_libdir}/wine/ntdll.dll.so
 %{_libdir}/wine/ntdsapi.dll.so
+%{_libdir}/wine/ntprint.dll.so
 %{_libdir}/wine/objsel.dll.so
 %{_libdir}/wine/odbc32.dll.so
 %{_libdir}/wine/odbccp32.dll.so
@@ -553,6 +556,7 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/olesvr32.dll.so
 %{_libdir}/wine/pdh.dll.so
 %{_libdir}/wine/powrprof.dll.so
+%{_libdir}/wine/printui.dll.so
 %{_libdir}/wine/psapi.dll.so
 %{_libdir}/wine/pstorec.dll.so
 %{_libdir}/wine/qcap.dll.so
@@ -746,6 +750,10 @@ update-desktop-database &>/dev/null || :
 %{_libdir}/wine/*.def
 
 %changelog
+* Tue Jul 03 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 0.9.40-1
+- version upgrade
+
 * Mon Jun 18 2007 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 0.9.39-2
 - fix desktop entries