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 4e22fad..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: yap
-# $Id$
-NAME := yap
-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/yap.spec b/yap.spec
index bf07ba7..bb7d987 100644
--- a/yap.spec
+++ b/yap.spec
@@ -1,6 +1,6 @@
 Name:		yap
 Version:	5.1.1
-Release:	2%{?dist}
+Release:	5%{?dist}
 
 Summary:	High-performance Prolog Compiler
 
@@ -48,12 +48,17 @@ Documentation for Yap.
 %setup -q -n Yap-%{version}
 %patch1 -p1
 cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} LGPL/chr
+# remove redundant rpath
+sed -i "/-Wl,-R/d" configure
+
 
 %build
+%define optflags $(echo $RPM_OPT_FLAGS | sed 's|-fstack-protector||')
 %configure \
 	--enable-coroutining \
 	--enable-max-performance \
-	--enable-depth-limit
+	--enable-depth-limit \
+        --enable-dynamic-loading
 make %{?_smp_mflags}
 (cd docs; make info)
 
@@ -100,6 +105,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/yap
 %{_datadir}/Yap
 %{_prefix}/lib/Yap
+%{_prefix}/lib/libYap.so
 %{_infodir}/*
 
 
@@ -120,6 +126,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul  5 2007 Gerard Milmeister <gemi@bluewin.ch> - 5.1.1-5
+- also build libYap.so
+
+* Fri May 11 2007 Gerard Milmeister <gemi@bluewin.ch> - 5.1.1-3
+- remove -fstack-protector from optflags in order to enable
+  loading of .so modules
+
 * Mon Aug 28 2006 Gerard Milmeister <gemi@bluewin.ch> - 5.1.1-2
 - Rebuild for FE6