2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index f4f0517864..1feac1659f 100644
--- a/Makefile
+++ b/Makefile
@@ -1595,8 +1595,8 @@ parsing/lexer.cmo: parsing/lexer.ml4
 revision:
 ifeq ($(CHECKEDOUT),1)
 	- /bin/rm -f revision
-	sed -ne '/url/s/^.*\/\([^\/]\+\)"$$/\1/p' .svn/entries > revision
-	sed -ne '/revision/s/^.*"\([0-9]\+\)".*$$/r\1/p' .svn/entries >> revision
+	sed -ne '/url/s/^.*\/\([^\/]\{1,\}\)"$$/\1/p' .svn/entries > revision
+	sed -ne '/revision/s/^.*"\([0-9]\{1,\}\)".*$$/r\1/p' .svn/entries >> revision
 endif
 
 archclean::
diff --git a/configure b/configure
index 2cc1f25c16..9b2bdb1bcb 100755
--- a/configure
+++ b/configure
@@ -305,6 +305,9 @@ if test ! -f "$CAMLC" ; then
     exit 1
 fi
 
+# this fixes a camlp4 bug under FreeBSD 
+# ("native-code program cannot do a dynamic load")
+if [ `uname -s` = "FreeBSD" ]; then camlp4oexec=$camlp4oexec.byte; fi
 
 CAMLVERSION=`"$bytecamlc" -v | sed -n -e 's|.*version* *\(.*\)$|\1|p' `