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 e59b301..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vim-vimoutliner
-# $Id$
-NAME := vim-vimoutliner
-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/vim-vimoutliner.spec b/vim-vimoutliner.spec
index 1c55085..ebc7e2d 100644
--- a/vim-vimoutliner.spec
+++ b/vim-vimoutliner.spec
@@ -2,7 +2,7 @@
 
 Name:           vim-vimoutliner
 Version:        0.3.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Script for building an outline editor on top of Vim
 Group:          Applications/Editors
 License:        GPL
@@ -18,7 +18,7 @@ Source4:        vimoutliner-README.Fedora
 Source5:        vimoutliner-Makefile
 Patch:          vimoutliner-mc-build.patch
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       vim-enhanced perl python
 Requires(post): vim-enhanced
 Requires(postun): vim-enhanced
@@ -91,6 +91,9 @@ fi
 %{_mandir}/man1/*.1.gz
 
 %changelog
+* Tue Apr  3 2007 Matej Cepl <mcepl@redhat.com> - 0.3.4-9
+- changed BuildRoot to more sane value, now it is allowed.
+
 * Mon Jan  8 2007 Matěj Cepl <mcepl@redhat.com> 0.3.4-8
 - changed named to vim-vimoutliner to follow Fedora Naming
   Guidelines.