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..7d9b445
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+yard-0.5.3.gem
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 360bbad..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: rubygem-yard
-# $Id$
-NAME := rubygem-yard
-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 $$d/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-yard.spec b/rubygem-yard.spec
new file mode 100644
index 0000000..6114a66
--- /dev/null
+++ b/rubygem-yard.spec
@@ -0,0 +1,92 @@
+%define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
+%define gemname yard
+%define geminstdir %{gemdir}/gems/%{gemname}-%{version}
+
+%define rubyabi 1.8 
+
+Name: rubygem-%{gemname}
+Summary: Documentation tool for consistent and usable documentation in Ruby
+Version: 0.5.3
+Release: 3%{?dist}
+Group: Development/Languages
+License: MIT and (GPLv2 or Ruby)
+URL: http://yardoc.org
+
+Source0: http://gemcutter.org/downloads/%{gemname}-%{version}.gem
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: rubygems
+Requires: ruby(abi) = %{rubyabi}
+BuildRequires: rubygems
+BuildRequires(check): rubygem(rake)
+BuildRequires(check): rubygem(rspec)
+BuildRequires(check): rubygem(RedCloth)
+BuildArch: noarch
+Provides: rubygem(%{gemname}) = %{version}
+
+%description
+YARD is a documentation generation tool for the Ruby programming language.
+It enables the user to generate consistent, usable documentation that can be
+exported to a number of formats very easily, and also supports extending for
+custom Ruby constructs such as custom class level definitions.
+
+
+%prep
+%setup -q -T -c
+
+%build
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{gemdir}
+mkdir -p %{buildroot}/%{_bindir}
+
+gem install --local --install-dir ./%{gemdir} \
+            --force --rdoc %{SOURCE0}
+cp -a ./%{gemdir}/* %{buildroot}/%{gemdir}/. 
+mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
+rmdir %{buildroot}%{gemdir}/bin
+find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
+
+%clean
+rm -rf %{buildroot}
+
+%check
+pushd .%{geminstdir} 
+rake spec || : 
+
+%files
+%defattr(-, root, root, -)
+%{_bindir}/yardoc
+%{_bindir}/yri
+%{_bindir}/yard-graph
+%dir %{geminstdir} 
+%{geminstdir}/bin
+%{geminstdir}/lib
+%{geminstdir}/templates
+%{geminstdir}/.yardopts
+
+%{gemdir}/cache/%{gemname}-%{version}.gem
+%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+
+%doc %{geminstdir}/LICENSE 
+%doc %{geminstdir}/README.md
+%doc %{geminstdir}/Rakefile
+%doc %{geminstdir}/ChangeLog
+%doc %{geminstdir}/benchmarks 
+%doc %{geminstdir}/spec
+%doc %{geminstdir}/docs
+%doc %{gemdir}/doc/%{gemname}-%{version}
+
+
+%changelog
+* Mon Feb 22 2010 Mohammed Morsi <mmorsi@redhat.com> - 0.5.3-3
+- fixed dependencies/package issues according to guidelines
+
+* Mon Feb 08 2010 Mohammed Morsi <mmorsi@redhat.com> - 0.5.3-2
+- cleaned up macros, other package guideline compliance fixes
+- corrected license, added MIT
+- include all files and docs, added check/test section
+
+* Mon Feb 08 2010 Mohammed Morsi <mmorsi@redhat.com> - 0.5.3-1
+- Initial package
+
diff --git a/sources b/sources
index e69de29..3e15974 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+5bf1e34356d0803203ddf97d03fdf0e3  yard-0.5.3.gem