diff --git a/.cvsignore b/.cvsignore
index 34e2562..e1d463e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-catfish-0.2.tar.gz
+catfish-0.2.1.tar.gz
diff --git a/catfish.spec b/catfish.spec
index d843f2d..bd387df 100644
--- a/catfish.spec
+++ b/catfish.spec
@@ -1,14 +1,12 @@
-%define		_version	0.2
-
 Name:		catfish
-Version:	0.2stable
+Version:	0.2.1
 Release:	1%{?dist}
 Summary:	A handy file search tool
 
 Group:		Applications/File
 License:	GPL
 URL:		http://software.twotoasts.de/?page=%{name}
-Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{_version}.tar.gz
+Source0:	http://software.twotoasts.de/media/%{name}/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -36,15 +34,17 @@ The interface is intentionally lightweight and simple. But it takes
 configuration options from the command line.
 
 %prep
-%setup -q -n %{name}-%{_version}
+%setup -q
 
 %build
-# Some configulation change
+# Some configulation changes
+#
+# msgfmt is fixed.
+# Linking is still broken...
 %{__sed} -i.misc \
-	-e 's|666|644|' \
 	-e '/svg/s|install|install -m 644|' \
-	-e 's|install |%{__install} -c -p |' \
-	-e 's|\([^ \t][^ \t]*\).glade|-m 644 \1.glade|' \
+	-e '/glade/s|install| install -m 644|' \
+	-e 's|install |install -p |' \
 	-e 's|pyc|py|' \
 	-e 's|^\([ \t]*\)ln |\1: ln |' \
 	-e 's|cp -rf|cp -prf|' \
@@ -62,15 +62,6 @@ configuration options from the command line.
 # and does not accept --libdir= option
 ./configure --prefix=%{_prefix}
 
-# Create gettext .mo files manually for now as
-# Makefile.in does not work
-for pofile in i18n/*.po ; do
-	lang=`basename $pofile | sed -e 's|\.po$||'`
-	dir=locale/${lang}/LC_MESSAGES
-	%{__mkdir_p} $dir
-	msgfmt -v --statistics $pofile -o $dir/%{name}.mo
-done
-
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -89,7 +80,6 @@ desktop-file-install \
 %{__ln_s} -f ../locale/ \
 	  $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
-%{__mv} -f $RPM_BUILD_ROOT%{_prefix}/locale $RPM_BUILD_ROOT%{_datadir}
 %{find_lang} %{name}
 
 %clean
@@ -105,6 +95,9 @@ desktop-file-install \
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Sun Feb 18 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 0.2.1-1
+- 0.2.1
+
 * Wed Feb 14 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> 0.2stable-1
 - 0.2
 
diff --git a/sources b/sources
index 2e163d7..8ba5127 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-848d61da8dcfd32dd1c5d2add6c10cd8  catfish-0.2.tar.gz
+a46d609476ab0492c87aa75ffa9b4a98  catfish-0.2.1.tar.gz