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 9310e25..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vbetool
-# $Id$
-NAME := vbetool
-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/vbetool.spec b/vbetool.spec
index b085126..8d1b362 100644
--- a/vbetool.spec
+++ b/vbetool.spec
@@ -1,6 +1,6 @@
 Name:           vbetool
 Version:        1.1
-Release:        3%{?dist}
+Release:        3%{?dist}.1
 Summary:        Run real-mode video BIOS code to alter hardware state
 
 Group:          System Environment/Base
@@ -13,7 +13,7 @@ BuildRequires:  zlib-devel pciutils-devel libx86-devel
 # does not build on ppc, ppc64 and sparc arches, see #285361 (RedHat Bugzilla)
 # on ppc sys/io.h is missing, on ppc64 there are more complaints
 # build.logs are attached in the bug report
-ExcludeArch:    ppc ppc64 %{sparc}
+ExcludeArch:    ppc ppc64 %{sparc} s390 s390x
 # vbetool is included in (some of) these pm-utils releases
 Conflicts:      pm-utils <= 0.99.3-11
 
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 07 2009 Karsten Hopp <karsten@redhat.com> 1.1-3.1
+- ExcludeArch s390, s390x
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild