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 741bd42..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: fribidi
-# $Id: Makefile,v 1.1 2004/09/09 04:52:46 cvsdist Exp $
-NAME := fribidi
-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/fribidi.spec b/fribidi.spec
index ce22fa0..d12dd17 100644
--- a/fribidi.spec
+++ b/fribidi.spec
@@ -28,9 +28,18 @@ FriBidi.
 %setup -q
 
 %build
+%if 0%{?el5}
+# FORTIFY_SOURCE=2 breaks EL-5 build
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed -e 's|FORTIFY_SOURCE=2|FORTIFY_SOURCE=1|'`
+%ifarch ppc ppc64 x86_64
+export CFLAGS="$CFLAGS -DPAGE_SIZE=4096"
+%endif
+%else
+# outside of EL-5, only ppc* needs modification
 %ifarch ppc ppc64
 export CFLAGS="$RPM_OPT_FLAGS -DPAGE_SIZE=4096"
 %endif
+%endif
 %configure --disable-static
 make %{?_smp_mflags}