diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 782380b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: webattery
-# $Id$
-NAME := webattery
-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/sources b/sources
index e69de29..2e9a77c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e21dccd1930d09bacf1019c1cb9648d6  webattery-1.2.tar.gz
diff --git a/webattery.spec b/webattery.spec
new file mode 100644
index 0000000..5d65cdc
--- /dev/null
+++ b/webattery.spec
@@ -0,0 +1,69 @@
+#Spec file of Webattery project for Fedora Distribution
+ 
+Name:           webattery
+Version:        1.2
+Release:        6%{?dist}
+Summary:        Command to display battery status
+Group:          Applications/System
+License:        GPLv3+
+URL:            http://webattery.sourceforge.net
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+
+%description
+Webattery is a command line tool to display battery status with a cool battery 
+like output.
+ 
+%prep
+ 
+%setup -q
+
+%build
+
+%configure
+ 
+make %{?_smp_mflags}
+
+ 
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} INSTALL="install -p"
+rm -rf %{buildroot}%{_bindir}/batt
+rm -rf %{buildroot}%{_mandir}/man1/batt.1
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc README COPYING TODO
+%{_mandir}/man1/webattery.1*
+%{_bindir}/webattery
+ 
+ 
+%changelog
+* Mon Jan 24 2010 Alagunambi Welkin <alagunambiwelkin@gmail.com> - 1.2-6
+- CFlags removed from make
+- Make modified under install macro
+- New version of source used
+- TODO file added in doc
+
+* Tue Jan 05 2010 Alagunambi Welkin <alagunambiwelkin@gmail.com> - 1.1-5
+- Removed '.' from man location under install macro
+- Previous change logs of spec file modified
+
+* Thu Dec 30 2009 Alagunambi Welkin <alagunambiwelkin@gmail.com> - 1.1-4
+- Build root tag added
+- Build root cleaning added at install
+
+* Thu Dec 24 2009 Alagunambi Welkin <alagunamniwelkin@gmail.com> - 1.1-3
+- Llicense tag changed
+- Removed compression type for man page under install macro
+
+* Thu Dec 24 2009 Alagunambi Welkin <alagunambiwelkin@gmail.com> - 1.1-2
+- removing 'buildroot' and batt, batt.1 removed by spec
+
+* Wed Dec 23 2009 Alagunambi Welkin <alagunambiwelkin@gmail.com> - 1.1-1
+- Initial package release