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 8cca39f..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wmx
-# $Id$
-NAME := wmx
-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/import.log b/import.log
deleted file mode 100644
index 324f196..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-wmx-7-1_fc10:HEAD:wmx-7-1.fc10.src.rpm:1231785276
diff --git a/wmx.spec b/wmx.spec
index 51b80cb..10663a3 100644
--- a/wmx.spec
+++ b/wmx.spec
@@ -1,6 +1,6 @@
 Name: wmx
 Version: 7
-Release: 5%{?dist}
+Release: 6%{?dist}
 Summary: A really simple window manager for X
 License: BSD
 Group: User Interface/X
@@ -49,10 +49,14 @@ configurable options.
 %defattr(-,root,root)
 %doc README* UPDATES TODO.netwm rsharman-patch/
 %{_bindir}/*
-%{_datadir}/*
+%{_datadir}/%{name}
+%{_datadir}/xsessions/*
 %{_sysconfdir}/X11/xinit/Xclients.d/*
 
 %changelog
+* Mon Mar 01 2010 Gabriel Somlo <somlo@cmu.edu> 7-6
+- fixed directory ownership (BZ 569408)
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild