diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index eb72f79..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-flexmock-0.8.6.gem
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e625cff
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+flexmock-0.8.7.gem
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c72d2e4..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rubygem-flexmock
-# $Id$
-NAME := rubygem-flexmock
-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-flexmock.spec b/rubygem-flexmock.spec
index c97c09a..f258dbd 100644
--- a/rubygem-flexmock.spec
+++ b/rubygem-flexmock.spec
@@ -7,7 +7,7 @@
 
 Summary:	Mock object library for ruby
 Name:		rubygem-%{gemname}
-Version:	0.8.6
+Version:	0.8.7
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	Copyright only
@@ -154,6 +154,9 @@ rake test_all --trace
 %{ruby_sitelib}/%{gemname}/
 
 %changelog
+* Fri Jul 23 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.8.7-1
+- 0.8.7
+
 * Thu Jul 30 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.8.6-1
 - Switch to gem, repackage
 
diff --git a/sources b/sources
index 6dfb5a0..89dd474 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b087a648c5051e44e1d16fd886a7ce20  flexmock-0.8.6.gem
+1fa75d05558c2daa98c99d1cd27fd563  flexmock-0.8.7.gem