diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index af38280..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xbindkeys-1.7.3.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1668208
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xbindkeys-1.8.0.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9c45b83..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xbindkeys
-# $Id$
-NAME := xbindkeys
-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/sources b/sources
index 77423ae..17902c2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eea2fe306e99274e8730e199b85706d5  xbindkeys-1.7.3.tar.gz
+71755c23faa113e891de6f2f871e0c76  xbindkeys-1.8.0.tar.gz
diff --git a/xbindkeys.spec b/xbindkeys.spec
index 6502dc3..519d126 100644
--- a/xbindkeys.spec
+++ b/xbindkeys.spec
@@ -1,6 +1,6 @@
 Name:           xbindkeys
-Version:        1.7.3
-Release:        4%{?dist}
+Version:        1.8.0
+Release:        1%{?dist}
 
 Summary:        Binds keys or mouse buttons to shell commands under X.
 License:        GPL
@@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0644, root, root) %{_mandir}/man?/*
 
 %changelog
+* Sat Jan 20 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.8.0-1
+- version 1.8.0
+
 * Thu Aug 31 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.7.3-4
 - rebuild