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 8f487b6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: chrpath
-# $Id$
-NAME := chrpath
-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/chrpath-0.13-NULL-entry.patch b/chrpath-0.13-NULL-entry.patch
new file mode 100644
index 0000000..27275d2
--- /dev/null
+++ b/chrpath-0.13-NULL-entry.patch
@@ -0,0 +1,16 @@
+diff -uNr chrpath-0.13.old/killrpath.c chrpath-0.13/killrpath.c
+--- chrpath-0.13.old/killrpath.c	2003-06-24 00:46:15.000000000 +0200
++++ chrpath-0.13/killrpath.c	2009-07-19 23:05:11.000000000 +0200
+@@ -73,8 +73,11 @@
+        if ( ! elf_dynpath_tag(dyns[i].d_tag) )
+         dynpos++;
+      }
+-   for (; dynpos < i; dynpos++)
++   for (; dynpos < i; dynpos++) {
+      dyns[dynpos].d_tag = DT_NULL;
++     dyns[dynpos].d_un.d_val = 0x0;
++   }
++
+ 
+    if (lseek(fd, phdr.p_offset, SEEK_SET) == -1
+        || write(fd, dyns, phdr.p_filesz) != (int)phdr.p_filesz)
diff --git a/chrpath.spec b/chrpath.spec
index fe973b3..44bfa5a 100644
--- a/chrpath.spec
+++ b/chrpath.spec
@@ -1,10 +1,11 @@
 Summary: Modify rpath of compiled programs
 Name: chrpath
 Version: 0.13
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL+
 Group: Development/Tools
 URL: ftp://ftp.hungry.com/pub/hungry/chrpath/
+Patch0: chrpath-0.13-NULL-entry.patch
 Source0: ftp://ftp.hungry.com/pub/hungry/chrpath/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -15,6 +16,7 @@ is supported.
 
 %prep
 %setup -q
+%patch0 -p1 -b .NULL
 
 %build
 %configure
@@ -36,8 +38,8 @@ rm -rf %{buildroot}
 %{_mandir}/man1/chrpath.1*
 
 %changelog
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.13-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Thu Jul 23 2009 Axel Thimm <Axel.Thimm@ATrpms.net> - 0.13-5
+- Fix last entry in .dynamic (by Christian Krause <chkr@plauener.de>).
 
 * Sat Sep  8 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.13-2
 - License: GPL+