diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 540b319..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-vbetool-1.2.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a71fb97
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vbetool-1.2.2.tar.bz2
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/sources b/sources
index a12ffb0..f85baa4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6a94f1c69c348de65e14a4ad9acbf795  vbetool-1.2.1.tar.bz2
+6d7ffb0c059b1a0d187ca7201efc3a73  vbetool-1.2.2.tar.bz2
diff --git a/vbetool.spec b/vbetool.spec
index 5c0ee8b..f6b7216 100644
--- a/vbetool.spec
+++ b/vbetool.spec
@@ -1,5 +1,5 @@
 Name:           vbetool
-Version:        1.2.1
+Version:        1.2.2
 Release:        1%{?dist}
 Summary:        Run real-mode video BIOS code to alter hardware state
 
@@ -52,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/udev/rules.d/92-video-post.rules
 
 %changelog
+* Fri Oct 02 2009 Dave Airlie <airlied@redhat.com> 1.2.2-1
+- update to 1.2.2 - fixes infinte loops on s/r (#516694)
+
 * Wed Aug 05 2009 Dave Airlie <airlied@redhat.com> 1.2.1-1
 - rebase to 1.2.1 and install the udev rules