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 f8bbb24..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xkeycaps
-# $Id$
-NAME := xkeycaps
-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/xkeycaps.desktop b/xkeycaps.desktop
index 7c937b6..d748e9a 100644
--- a/xkeycaps.desktop
+++ b/xkeycaps.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Name=xkeycaps
 GenericName=xkeycaps
 Comment=Graphical front-end to xmodmap
-Exec=xkeycaps
+Exec=/usr/X11R6/bin/xkeycaps
 Icon=xkeycaps.png
 StartupNotify=false
 Terminal=false
diff --git a/xkeycaps.spec b/xkeycaps.spec
index 0a800ef..695e219 100644
--- a/xkeycaps.spec
+++ b/xkeycaps.spec
@@ -1,20 +1,18 @@
-# FC-5 version
+# FC-3/FC-4 version
 
 Name:		xkeycaps
 Summary: 	Graphical front end to xmodmap
 Version:	2.46
-Release:	2%{?dist}
-License:	BSD-ish
+Release:	5%{?dist}
+License:	MIT
 Group:		Applications/System
 Source0:	http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z
 Source1:	xkeycaps.desktop
 Source2:	xkeycaps.png
 URL:		http://www.jwz.org/xkeycaps/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-xbitmaps, libICE-devel, libXmu-devel, libSM-devel
-BuildRequires:	libXaw-devel, imake, libXt-devel, xorg-x11-proto-devel
-BuildRequires:	desktop-file-utils, libXext-devel
-Requires:	xorg-x11-server-utils
+BuildRequires:	xorg-x11-devel, xorg-x11-deprecated-libs-devel
+BuildRequires:	desktop-file-utils
 
 %description
 xkeycaps is a graphical front-end to xmodmap. It opens a window that 
@@ -29,7 +27,8 @@ xmodmap to recreate your changes in future sessions.
 %setup -q 
 
 %build
-xmkmf
+/usr/X11R6/bin/xmkmf
+sed -i -e 's/^\(\s*CFLAGS\s*=.*\)/\1 $(RPM_OPT_FLAGS)/' Makefile
 make
 
 %install
@@ -50,12 +49,21 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc README sgi-microsoft.txt
-%{_bindir}/xkeycaps
+/usr/X11R6/bin/xkeycaps
 %{_datadir}/applications/fedora-xkeycaps.desktop
 %{_datadir}/pixmaps/xkeycaps.png
 %{_mandir}/man1/*
 
 %changelog
+* Mon Aug  6 2007 Tom "spot" Callaway <tcallawa@redhat.com> 2.46-5
+- el-4 variant
+
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.46-4
+- bump for FC-5
+
+* Mon Jan 16 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.46-3
+- fix FC-3/FC-4
+
 * Mon Jan 16 2006 Tom "spot" Callaway <tcallawa@redhat.com> 2.46-2
 - add missing BR
 - fix missing desktop file