diff --git a/.cvsignore b/.cvsignore
index 2ca5abb..06fc6ad 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xapian-core-1.0.2.tar.gz
+xapian-core-1.0.4.tar.gz
diff --git a/multilib-devel-conflict-fix.patch b/multilib-devel-conflict-fix.patch
index 18618b3..3ac3c05 100644
--- a/multilib-devel-conflict-fix.patch
+++ b/multilib-devel-conflict-fix.patch
@@ -1,6 +1,6 @@
-diff -upNr xapian-core-1.0.2.orign/xapian-config.in xapian-core-1.0.2/xapian-config.in
---- xapian-core-1.0.2.orign/xapian-config.in	2007-07-05 02:39:51.000000000 +0200
-+++ xapian-core-1.0.2/xapian-config.in	2007-10-26 00:45:12.000000000 +0200
+diff -upNr xapian-core-1.0.4.orign/xapian-config.in xapian-core-1.0.4/xapian-config.in
+--- xapian-core-1.0.4.orign/xapian-config.in	2007-10-30 06:46:39.000000000 +0100
++++ xapian-core-1.0.4/xapian-config.in	2007-10-30 13:55:39.000000000 +0100
 @@ -68,7 +68,6 @@ set_F_to_extra_ldflags() {
  # -L option required (if any).
  set_L_to_library_path() {
@@ -9,19 +9,32 @@ diff -upNr xapian-core-1.0.2.orign/xapian-config.in xapian-core-1.0.2/xapian-con
  }
  
  # -I options for compiling against an uninstalled xapian.
-@@ -204,11 +203,6 @@ while [ 0 != "$#" ] ; do
- 	    # yet.
- 	    ;;
- 	*)
--	    # Only pull in dependency_libs if libtool would.
--	    if [ no != "@link_all_deplibs_CXX@" ]; then
--		extract_dependency_libs "@libdir@/libxapian.la"
--		[ -n "$dependency_libs" ] && D=" $dependency_libs"
--	    fi
- 	    ;;
- 	esac
+@@ -203,24 +202,7 @@ while [ 0 != "$#" ] ; do
+ 	fi
+ 	set_F_to_extra_ldflags
+ 	set_L_to_library_path
+-	extract_dlname "@libdir@/libxapian.la"
+-	# For static libraries, we need to explicitly link with dependency_libs
+-	# on all platforms.  For shared libraries, only pull in dependency_libs
+-	# if libtool would.
+-	explicit_dependencies=yes
+-	if [ -n "$dlname" ] && [ no != "@link_all_deplibs_CXX@" ]; then
+-	    case "@host_os@" in
+-	    linux* | k*bsd*-gnu)
+-		# We don't need dependency_libs for shared libraries on these
+-		# platforms, but upstream libtool doesn't know this (yet).
+-		explicit_dependencies=no ;;
+-	    esac
+-	fi
+ 	D=
+-	if [ yes = "$explicit_dependencies" ] ; then
+-	    extract_dependency_libs "@libdir@/libxapian.la"
+-	    [ -n "$dependency_libs" ] && D=" $dependency_libs"
+-	fi
  	echo "$F$L-lxapian$D"
-@@ -224,11 +218,6 @@ while [ 0 != "$#" ] ; do
+ 	;;
+ 
+@@ -234,11 +216,6 @@ while [ 0 != "$#" ] ; do
  	    continue
  	fi
  
@@ -30,6 +43,6 @@ diff -upNr xapian-core-1.0.2.orign/xapian-config.in xapian-core-1.0.2/xapian-con
 -	    continue
 -	fi
 -
- 	# If we need to pull in dependency_libs, we need libxapian.la.  Otherwise
- 	# we can cope with out it, which is useful as some Linux distros have an
- 	# unhelpful policy of not packaging .la files.
+ 	# If we need to pull in dependency_libs, we need libxapian.la.
+ 	# Otherwise we can cope with out it, which is useful as some Linux
+ 	# distros have an unhelpful policy of not packaging .la files.
diff --git a/sources b/sources
index 3c05ce7..aab22f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9e7f0498bba8a6dad9474f20a8bd17c1  xapian-core-1.0.2.tar.gz
+57cd26fb4a3677bfe05d4c9df5012357  xapian-core-1.0.4.tar.gz
diff --git a/xapian-core.spec b/xapian-core.spec
index 1d2c789..dbcc36a 100644
--- a/xapian-core.spec
+++ b/xapian-core.spec
@@ -1,7 +1,7 @@
 Summary: The Xapian Probabilistic Information Retrieval Library
 Name: xapian-core
-Version: 1.0.2
-Release: 7%{?dist}
+Version: 1.0.4
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Databases
 URL: http://www.xapian.org/
@@ -120,6 +120,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/xapian-config.1*
 
 %changelog
+* Tue Oct 30 2007 Adel Gadllah <adel.gadllah@gmail.com> 1.0.4-1
+- Update to 1.0.4
+
 * Fri Oct 25 2007 Adel Gadllah <adel.gadllah@gmail.com> 1.0.2-7
 - Fix up multilib patch