diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 55d4b85..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-wmctrl-1.07.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3471b8a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+wmctrl-1.07.tar.gz
+wmctrl_1.07-6.diff.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 0b2ca2e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wmctrl
-# $Id$
-NAME := wmctrl
-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 1fa10c5..3b52946 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 1fe3c7a2caa6071e071ba34f587e1555  wmctrl-1.07.tar.gz
+7ddf2aadc48f4300c16160b3c9a7e141  wmctrl_1.07-6.diff.gz
diff --git a/wmctrl.spec b/wmctrl.spec
index 5fb4fcc..8253c38 100644
--- a/wmctrl.spec
+++ b/wmctrl.spec
@@ -1,12 +1,13 @@
 Name:           wmctrl
 Version:        1.07
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A command line tool to interact with an X Window Manager
 
 Group:          User Interface/X
-License:        GPL
+License:        GPLv2+
 URL:            http://sweb.cz/tripie/utils/wmctrl
 Source0:        http://sweb.cz/tripie/utils/wmctrl/dist/%{name}-%{version}.tar.gz
+Patch0:         http://ftp.de.debian.org/debian/pool/main/w/wmctrl/wmctrl_1.07-6.diff.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  xorg-x11-proto-devel, libXmu-devel, glib2-devel
@@ -25,6 +26,10 @@ BuildRequires:  xorg-x11-proto-devel, libXmu-devel, glib2-devel
 
 %prep
 %setup -q 
+%patch0 -p1
+iconv -f latin1 -t utf8 ChangeLog > ChangeLog.utf8
+touch -c -r ChangeLog ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
 
 %build
 %configure 
@@ -48,6 +53,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 28 2008 Patrice Dumas <pertusus@free.fr> - 1.07-5
+- apply debian patcheset, to fix #426383
+
+* Sat Sep  6 2008 Tom "spot" Callaway <tcallawa@redhat.com> 1.07-4
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.07-3
 - Autorebuild for GCC 4.3