diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 72e6abd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-acpitool-0.3.0.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..7733c3c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+acpitool-0.4.7.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index c619d2e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: acpitool
-# $Id$
-NAME := acpitool
-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/acpitool-keep_CXXFLAGS.diff b/acpitool-keep_CXXFLAGS.diff
deleted file mode 100644
index 469b6e4..0000000
--- a/acpitool-keep_CXXFLAGS.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- acpitool-0.3.0-orig/configure	2005-10-22 15:10:09.000000000 +0200
-+++ acpitool-0.3.0/configure	2005-11-10 23:49:15.000000000 +0100
-@@ -3374,27 +3374,6 @@
- 
- 
- 
--CXXFLAGS="-O2 -Wall"
--
--
--case ${host_cpu} in
--*586)
--	CXXFLAGS="${CXXFLAGS} -mcpu=i586 -march=i586"
--	;;
--*686)
--	CXXFLAGS="${CXXFLAGS} -mcpu=i686 -march=i686"
--	;;
--x86-64)
--	CXXFLAGS="${CXXFLAGS} -march=k8"
--	;;
--*)
--	;;
--esac
--
--echo "$as_me:$LINENO: result: $CXXFLAGS" >&5
--echo "${ECHO_T}$CXXFLAGS" >&6
--
--
- # Checks for libraries.
- 
- # Checks for header files.
diff --git a/acpitool.spec b/acpitool.spec
index 0e34ec5..2d6c225 100644
--- a/acpitool.spec
+++ b/acpitool.spec
@@ -1,26 +1,24 @@
+Summary: Command line ACPI client
 Name: acpitool
-Version: 0.3.0
-Release: 3%{?dist}
-Url: http://freeunix.dyndns.org:8088/site2/acpitool.shtml
-Source0: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.gz
-Summary: A command line ACPI client for Linux
-Group: Applications/Internet
+Version: 0.4.7
+Release: 2%{?dist}
 License: GPL
-Patch: acpitool-keep_CXXFLAGS.diff
+Group: Applications/System
+URL: http://freeunix.dyndns.org:8000/site2/acpitool.shtml
+
+Source: http://freeunix.dyndns.org:8000/ftp_site/pub/unix/acpitool/acpitool-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-AcpiTool is a Linux ACPI client. It's a small command line application,
-intended to be a replacement for the apm tool. The primary target
-audience are laptop users, since these people are most interested in
-things like battery status, thermal status and the ability to suspend
-(sleep mode). The program simply accesses the /proc/acpi or /sysfs entries
-to get/set acpi values. Hence, a computer running a Linux kernel from
-the 2.4.x or 2.6.x series with ACPI enabled is needed.
+AcpiTool is a Linux ACPI client. It's a small command line application, 
+intended to be a replacement for the apm tool. The primary target audience 
+are laptop users, since these people are most interested in things like 
+battery status, thermal status and the ability to suspend (sleep mode). 
+The program simply accesses the /proc/acpi or /sysfs entries to get or set 
+ACPI values.
 
 %prep
-%setup
-%patch -p1
+%setup -q
 
 %build
 %configure
@@ -35,18 +33,33 @@ rm -fr $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO ChangeLog AUTHORS COPYING
+%doc AUTHORS ChangeLog COPYING INSTALL README TODO
 %{_bindir}/acpitool
 %{_mandir}/man1/acpitool*
 
 %changelog
-* Thu Nov 10 2005 Patrice Dumas <dumas@centre-cired.fr> - 0.3.0-3
+* Thu May 24 2007 Patrice Dumas <pertusus@free.fr> 0.4.7-2
+- update to 0.4.7
+
+* Fri Oct  6 2006 Patrice Dumas <pertusus@free.fr> 0.4.6-2
+- set Group to Applications/System (fix #209230)
+
+* Mon Aug 28 2006 Patrice Dumas <pertusus@free.fr> 0.4.6-1
+- update to 0.4.6
+
+* Sun May 21 2006 Patrice Dumas <pertusus@free.fr> 0.4.5-1
+- update to 0.4.5
+
+* Thu Feb 16 2006 Patrice Dumas <pertusus@free.fr> 0.4.4-1.1
+- new version
+- remove now unneeded patch
+
+* Thu Nov 10 2005 Patrice Dumas <pertusus@free.fr> 0.3.0-3
 - add patch to avoid ignoring CXXFLAGS
 
-* Fri Nov  4 2005 Patrice Dumas <dumas@centre-cired.fr> - 0.3.0-2
+* Fri Nov  4 2005 Patrice Dumas <pertusus@free.fr> 0.3.0-2
 - update using fedora core conventions, some cleanings
 
 * Tue Aug 24 2004 Robert Ambrose <rna@muttsoft.com>
 - Created .spec file.
 
-
diff --git a/sources b/sources
index bba6ba1..0a4423e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f9fb795790e370e8e324fc7d4d4fe3f  acpitool-0.3.0.tar.gz
+cba416a11229e896ec2639c59b6f59c5  acpitool-0.4.7.tar.bz2