diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d5b8d1c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+rake-compiler-0.6.0.gem
diff --git a/Makefile b/Makefile
deleted file mode 100644
index cb4f8f3..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rubygem-rake-compiler
-# $Id$
-NAME := rubygem-rake-compiler
-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-rake-compiler.spec b/rubygem-rake-compiler.spec
new file mode 100644
index 0000000..23d0355
--- /dev/null
+++ b/rubygem-rake-compiler.spec
@@ -0,0 +1,109 @@
+%global	gemname	rake-compiler
+%global	gemdir		%(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%global	geminstdir	%{gemdir}/gems/%{gemname}-%{version}
+
+%global	rubyabi	1.8
+
+Summary:	Rake-based Ruby C Extension task generator
+Name:		rubygem-%{gemname}
+Version:	0.6.0
+Release:	1%{?dist}
+Group:		Development/Languages
+License:	MIT
+URL:		http://rake-compiler.rubyforge.org/
+Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	ruby(abi) = %{rubyabi}
+BuildRequires:	ruby(rubygems)
+Requires:	ruby(abi) = %{rubyabi}
+Requires:	ruby(rubygems)
+Requires:	rubygem(rake) >= 0.8.3
+BuildArch:	noarch
+Provides:	rubygem(%{gemname}) = %{version}-%{release}
+
+%description
+rake-compiler aims to help Gem developers while dealing with
+Ruby C extensions, simplifiying the code and reducing the duplication.
+
+It follows *convention over configuration* and set an standarized
+structure to build and package C extensions in your gems.
+
+This is the result of expriences dealing with several Gems 
+that required native extensions across platforms and different 
+user configurations where details like portability and 
+clarity of code were lacking. 
+
+%package	doc
+Summary:	Documentation for %{name}
+Group:		Documentation
+Requires:	%{name} = %{version}-%{release}
+
+%description	doc
+This package contains documentation for %{name}.
+
+%prep
+%setup -q -c -T
+
+mkdir -p .%{gemdir}
+gem install \
+	--local \
+	--install-dir $(pwd)%{gemdir} \
+	--force \
+	--rdoc \
+	-V \
+	%{SOURCE0}
+
+# rpmlint cosmetic
+pushd .%{geminstdir}
+sed -i -e 's|\r||' README.rdoc
+find ./lib/rake -name \*.rb | xargs sed -i -e '\@/usr/bin/env@d'
+popd
+
+%build
+
+%install
+rm -rf %{buildroot}
+
+mkdir -p %{buildroot}%{gemdir}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
+
+# Move files under %%_bindir
+mkdir -p %{buildroot}/%{_bindir}
+mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
+
+rmdir %{buildroot}%{gemdir}/bin
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/rake-compiler
+%dir %{geminstdir}
+%doc %{geminstdir}/README.rdoc
+%doc %{geminstdir}/LICENSE.txt
+%doc %{geminstdir}/History.txt
+%{geminstdir}/Rakefile
+%{geminstdir}/cucumber.yml
+%{geminstdir}/[a-z]*/
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+
+%files doc
+%defattr(-,root,root,-)
+%{gemdir}/doc/%{gemname}-%{version}
+
+
+%changelog
+* Wed Jul 29 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.6.0-1
+- 0.6.0
+
+* Sat Jul 25 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.5.0-2
+- F-12: Mass rebuild
+
+* Thu Jul  2 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.5.0-2
+- Restore files under %%{geminstdir}/bin
+
+* Thu Jun 11 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 0.5.0-1
+- Initial package
diff --git a/sources b/sources
index e69de29..bdfb6a8 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+9a8edefde6ca9df9222f6cfe3973c130  rake-compiler-0.6.0.gem