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 9b1e40a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: libXrender
-# $Id$
-NAME := libXrender
-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),)
-# attempt 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/libXrender.spec b/libXrender.spec
index 482dd60..e1eee13 100644
--- a/libXrender.spec
+++ b/libXrender.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 libXrender runtime library
 Name: libXrender
-Version: 0.9.4
-Release: 7%{?dist}
+Version: 0.9.5
+Release: 1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.x.org
@@ -30,20 +30,16 @@ X.Org X11 libXrender development package
 %prep
 %setup -q
 
-# Disable static library creation by default.
-%define with_static 0
-
 %build
-%configure \
-%if ! %{with_static}
-	--disable-static
-%endif
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
+# undo this, we'll add it ourselves in %%doc
+rm $RPM_BUILD_ROOT/%{_docdir}/*/libXrender.txt
 
 # We intentionally don't ship *.la files
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -62,14 +58,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root,-)
+%doc doc/libXrender.txt
 %{_includedir}/X11/extensions/Xrender.h
-%if %{with_static}
-%{_libdir}/libXrender.a
-%endif
 %{_libdir}/libXrender.so
 %{_libdir}/pkgconfig/xrender.pc
 
 %changelog
+* Tue Oct 06 2009 Adam Jackson <ajax@redhat.com> 0.9.5-1
+- libXrender 0.9.5
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 5ac2438..0b02858 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc266e850c51368f964e0d67bf5fb5e6  libXrender-0.9.4.tar.bz2
+276dd9e85daf0680616cd9f132b354c9  libXrender-0.9.5.tar.bz2