diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index d81205e..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-htmlentities-4.0.0.gem
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bfb26cc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+htmlentities-4.2.1.gem
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e29c289..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rubygem-htmlentities
-# $Id$
-NAME := rubygem-htmlentities
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/rubygem-htmlentities.spec b/rubygem-htmlentities.spec
index c273024..ad4e045 100644
--- a/rubygem-htmlentities.spec
+++ b/rubygem-htmlentities.spec
@@ -9,8 +9,8 @@
 
 Summary:	A module for encoding and decoding (X)HTML entities
 Name:		rubygem-%{gemname}
-Version:	4.0.0
-Release:	2%{?dist}
+Version:	4.2.1
+Release:	1%{?dist}
 Group:		Development/Languages
 License:	MIT
 URL:		http://htmlentities.rubyforge.org/
@@ -58,6 +58,9 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a ./%{gemdir}/* %{buildroot}%{gemdir}/
 
+# Cleanups
+rm -f %{buildroot}%{geminstdir}/setup.rb
+
 # Create symlinks for ruby-%%{gemname}
 # Copied from rubygem-gettext.spec
 
@@ -125,6 +128,7 @@ rm -rf %{buildroot}
 %dir	%{geminstdir}
 %doc	%{geminstdir}/[A-Z]*
 %{geminstdir}/lib/
+%doc	%{geminstdir}/perf/
 %doc	%{geminstdir}/test/
 
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -137,6 +141,21 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Apr 11 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.2.1-1
+- 4.2.1
+
+* Wed Jan 13 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.2.0-2.respin1
+- 4.2.0 (tarball seems respun)
+
+* Thu Aug 27 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.2.0-1
+- 4.2.0
+
+* Fri Aug 21 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.1.0-1
+- 4.1.0
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 4.0.0-3
+- F-12: Mass rebuild
+
 * Fri Mar 6 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
 - Cleanups
 
diff --git a/sources b/sources
index 8bb36b8..29a082c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8490050367c95d63f83049852f7e93a8  htmlentities-4.0.0.gem
+9ef40bc84cf09c1a653c56c440d166fc  htmlentities-4.2.1.gem