diff --git a/.cvsignore b/.cvsignore
index 21d73df..828c146 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1 @@
-comix-3.6.5.tar.gz
-comix-4.0-svn199_trunk.tar.gz
+comix-4.0.0.tar.gz
diff --git a/comix.spec b/comix.spec
index e8626ee..7728056 100644
--- a/comix.spec
+++ b/comix.spec
@@ -3,11 +3,11 @@
 # mv trunk comix-%%mainver
 # tar czf comix-%%mainver-%%alphatag.tar.gz comix-%%mainver
 
-%define		mainver		4.0
-%define		alphatag	svn199_trunk
+%define		mainver		4.0.0
+%undefine		alphatag
 %define		comix4		1
 
-%define		ifalpha		1
+%undefine		ifalpha	
 %define		fedorarel	1
 
 Name:		comix
@@ -23,9 +23,11 @@ Source0:	%{name}-%{mainver}-%{alphatag}.tar.gz
 %else
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 %endif
+#Source1:	comix-ja.po
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
+BuildRequires:	gettext
 BuildRequires:	pygtk2
 BuildRequires:	python-imaging
 BuildRequires:	desktop-file-utils
@@ -46,7 +48,7 @@ well as plain image files. It is written in Python and
 uses GTK+ through the PyGTK bindings.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?ifalpha:-%alphatag}
 
 %{__mkdir_p} TMPBIN
 cd TMPBIN
@@ -60,6 +62,11 @@ cd ..
 %{__sed} -e 's|\r||g' COPYING > COPYING.tmp && \
 	( touch -r COPYING COPYING.tmp ; %{__mv} -f COPYING.tmp COPYING )
 %{__rm} -f COPYING.tmp
+
+for dir in messages/*/LC*/
+do
+	msgfmt --statistics -o $dir/comix.mo $dir/comix.po
+done
 	
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -169,7 +176,14 @@ exit 0
 
 
 %changelog
-* Fri Oct  3 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+* Thu Dec  4 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0.0-1
+- 4.0.0
+
+* Mon Dec  1 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0-0.2.rc1
+- 4.0.0 rc1
+- Update ja.po
+
+* Fri Oct  3 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0-0.1.svn199_trunk
 - 4.0 branch, rev 199
 
 * Thu Jul 10 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 3.6.5-1
diff --git a/sources b/sources
index 91b2a7c..ef83934 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4f6210ee04b5b01cb37ab58638278a03  comix-3.6.5.tar.gz
-cb79e3b4161408c33ae4bab02966735f  comix-4.0-svn199_trunk.tar.gz
+1db52410c986b98a49537f9e1797416f  comix-4.0.0.tar.gz