diff --git a/.cvsignore b/.cvsignore
index aa4b4d0..7151b18 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-comix-4.0.3.tar.gz
+comix-4.0.4.tar.gz
diff --git a/comix.spec b/comix.spec
index 6c4401c..4b7cecd 100644
--- a/comix.spec
+++ b/comix.spec
@@ -3,12 +3,12 @@
 # mv trunk comix-%%mainver
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
-%define		mainver		4.0.3
+%define		mainver		4.0.4
 %undefine		alphatag	
 %define		comix4		1
 
 %undefine		ifalpha		
-%define		fedorarel	3
+%define		fedorarel	1
 
 Name:		comix
 Version:	%{mainver}
@@ -23,8 +23,6 @@ Source0:	%{name}-%{mainver}-%{alphatag}.tar.gz
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
-# Use upstreamed patch
-Patch0:		comix-4.0.3-filechooser.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -50,7 +48,6 @@ uses GTK+ through the PyGTK bindings.
 
 %prep
 %setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
-%patch0 -p0 -b .filechooser
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -65,6 +62,12 @@ cd ..
 	( touch -r COPYING COPYING.tmp ; %{__mv} -f COPYING.tmp COPYING )
 %{__rm} -f COPYING.tmp
 
+# embed Fedora EVR
+%{__sed} -i -e "/^VERSION/s|^\(.*\)$|\1\nVERSION_fedora = '%{version}-%{release}'|" \
+	src/constants.py
+%{__sed} -i -e "s|constants\.VERSION|constants.VERSION_fedora|" \
+	src/about.py
+
 for dir in messages/*/LC*/
 do
 	msgfmt --statistics -o $dir/comix.mo $dir/comix.po
@@ -182,6 +185,10 @@ exit 0
 
 
 %changelog
+* Wed Apr  8 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0.4-1
+- 4.0.4, remove upsteamed patch
+- Embed Fedora EVR to src/about.py
+
 * Sat Feb 28 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0.3-3
 - Use upstreamed patch for filechooser issue
 
diff --git a/sources b/sources
index 7cdb1e0..5fc039c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5bd7acefe3950c2fdaf8785edd27b7e  comix-4.0.3.tar.gz
+029227a77b122f7080ee0280d41bee78  comix-4.0.4.tar.gz