diff --git a/.cvsignore b/.cvsignore
index 4caa9d2..aa4b4d0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-comix-4.0.3-rc1.tar.gz
-comix-ja.po.gz
+comix-4.0.3.tar.gz
diff --git a/comix-4.0.3-filechooser.patch b/comix-4.0.3-filechooser.patch
new file mode 100644
index 0000000..afd1fd5
--- /dev/null
+++ b/comix-4.0.3-filechooser.patch
@@ -0,0 +1,34 @@
+--- src/filechooser.py.debug	2009-02-16 01:44:39.000000000 +0900
++++ src/filechooser.py	2009-02-23 15:29:36.000000000 +0900
+@@ -195,9 +195,12 @@
+ 
+     def files_chosen(self, paths):
+         if paths:
+-            current_filter_index = self.filechooser.list_filters().index(
+-                self.filechooser.get_filter())
+-            prefs['last filter in main filechooser'] = current_filter_index
++            try:
++                current_filter_index = self.filechooser.list_filters().index(
++                    self.filechooser.get_filter())
++                prefs['last filter in main filechooser'] = current_filter_index
++            except:
++                pass
+             _close_main_filechooser_dialog()
+             self._window.file_handler.open_file(paths[0])
+         else:
+@@ -255,9 +258,12 @@
+             else:
+                 prefs['auto add books into collections'] = False
+                 collection_name = None
+-            current_filter_index = self.filechooser.list_filters().index(
+-                self.filechooser.get_filter())
+-            prefs['last filter in library filechooser'] = current_filter_index
++            try:
++                current_filter_index = self.filechooser.list_filters().index(
++                    self.filechooser.get_filter())
++                prefs['last filter in library filechooser'] = current_filter_index
++            except:
++                pass
+             close_library_filechooser_dialog()
+             self._library.add_books(paths, collection_name)
+         else:
diff --git a/comix.spec b/comix.spec
index c51599d..a9ce5d5 100644
--- a/comix.spec
+++ b/comix.spec
@@ -4,10 +4,10 @@
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
 %define		mainver		4.0.3
-%define		alphatag	rc1
+%undefine		alphatag	
 %define		comix4		1
 
-%define		ifalpha		1
+%undefine		ifalpha		
 %define		fedorarel	1
 
 Name:		comix
@@ -23,7 +23,8 @@ Source0:	%{name}-%{mainver}-%{alphatag}.tar.gz
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
-Source1:	comix-ja.po.gz
+# Need contact with upstream
+Patch0:		comix-4.0.3-filechooser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -49,7 +50,7 @@ uses GTK+ through the PyGTK bindings.
 
 %prep
 %setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
-gzip -dc %SOURCE1 > messages/ja/LC_MESSAGES/comix.po
+%patch0 -p0 -b .filechooser
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -122,7 +123,6 @@ gconftool-2 --makefile-install-rule \
 	%{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null
 
 touch --no-create %{_datadir}/icons/hicolor
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 
 update-desktop-database &> /dev/null
 update-mime-database %{_datadir}/mime &> /dev/null
@@ -139,12 +139,17 @@ gconftool-2 --makefile-uninstall-rule \
 exit 0
 
 %postun
+update-desktop-database &> /dev/null
+update-mime-database %{_datadir}/mime &> /dev/null
+
+[ $1 -eq 0 ] || exit 0
 touch --no-create %{_datadir}/icons/hicolor
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 
-update-desktop-database &> /dev/null
-update-mime-database %{_datadir}/mime &> /dev/null
+exit 0
 
+%posttrans
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 exit 0
 
 %files -f %{name}.lang
@@ -177,6 +182,11 @@ exit 0
 
 
 %changelog
+* Mon Feb 23 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0.3-1
+- 4.0.3
+- Modify icon cache updating scriptlets to follow latest guidelines
+- Patch for filechooser.py to prevent file choice failure
+
 * Tue Jan 27 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0.3-0.1.rc1
 - 4.0.3 rc1
 
diff --git a/sources b/sources
index a2ec3cf..7cdb1e0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ceafa1334e0f0f9f091a1a8704d2262f  comix-4.0.3-rc1.tar.gz
-ab1b42af115291a39b09a9d9f33ed383  comix-ja.po.gz
+e5bd7acefe3950c2fdaf8785edd27b7e  comix-4.0.3.tar.gz