diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index f4b98fe..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-xlockmore-5.26.1.tar.bz2
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a3e37fa
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+xlockmore-5.28.tar.bz2
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 2a18cb7..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: xlockmore
-# $Id$
-NAME := xlockmore
-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 d0d8305..dd75294 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db7faeb82074a5a1593ce60297c13f20  xlockmore-5.26.1.tar.bz2
+76bd1c42f1d1f2d9ea3d2d1837f7469e  xlockmore-5.28.tar.bz2
diff --git a/xlockmore-fix_petri.patch b/xlockmore-fix_petri.patch
new file mode 100644
index 0000000..f1dac93
--- /dev/null
+++ b/xlockmore-fix_petri.patch
@@ -0,0 +1,11 @@
+--- modes/petri.c.orig	2009-08-20 08:05:37.000000000 +0200
++++ modes/petri.c	2009-08-20 08:05:46.000000000 +0200
+@@ -217,7 +217,7 @@
+    cell *arr;
+    cell *head;
+    cell *tail;
+-   int count;
++   unsigned int count;
+    Bool originalcolors;
+    GC *coloredGCs;
+    int blastcount;
diff --git a/xlockmore.spec b/xlockmore.spec
index 7d341d7..512b68f 100644
--- a/xlockmore.spec
+++ b/xlockmore.spec
@@ -1,11 +1,12 @@
 Summary: Screen lock and screen saver
 Name: xlockmore
-Version: 5.26.1
-Release: 2%{?dist}
+Version: 5.28
+Release: 1%{?dist}
 License: BSD
 Group: Amusements/Graphics
 URL: http://www.tux.org/~bagleyd/xlockmore.html
-Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.26.1/xlockmore-5.26.1.tar.bz2
+Source0: http://www.tux.org/~bagleyd/xlock/xlockmore-5.28/xlockmore-5.28.tar.bz2
+Patch0: xlockmore-fix_petri.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pam-devel esound-devel
 BuildRequires: mesa-libGL-devel mesa-libGLU-devel
@@ -34,6 +35,7 @@ GTK based frontend for xlockmore.
 
 %prep
 %setup -q
+%patch0
 
 %{__sed} -i -e "s,/lib,/%{_lib},g" configure
 
@@ -107,6 +109,13 @@ desktop-file-install \
 %{_bindir}/xglock
 
 %changelog
+* Sun Aug 30 2009 Adrian Reber <adrian@lisas.de> - 5.28-1
+- updated to 5.28
+- applied patch to fix "xlock -mode petri segfaults with 32 bit displays" (#518379)
+
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.26.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.26.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild