diff -ruN geneweb-6.08/rpm/geneweb-initrc.sh geneweb-6.08-a/rpm/geneweb-initrc.sh
--- geneweb-6.08/rpm/geneweb-initrc.sh	2015-05-07 13:42:44.000000000 +0400
+++ geneweb-6.08-a/rpm/geneweb-initrc.sh	2015-05-26 20:03:50.129426431 +0400
@@ -21,9 +21,9 @@
 	echo "Starting GeneWeb Services:"
         touch /var/log/gwd.log /var/log/gwsetup.log
         chown geneweb /var/log/gwd.log /var/log/gwsetup.log
-	mkdir -p /home/geneweb/bases
-	chmod a+rw /home/geneweb/bases
-	cd /home/geneweb/bases
+	mkdir -p /opt/geneweb/bases
+	chmod a+rw /opt/geneweb/bases
+	cd /opt/geneweb/bases
 	hd=../gw/gw
 	$hd/gwd -log /var/log/gwd.log -daemon -hd $hd -setup_link
 	$hd/gwsetup -daemon -gd $hd 2>> /var/log/gwsetup.log
@@ -31,7 +31,7 @@
 	;;
   stop)
 	echo -n "Shutting down GeneWeb Services: "
-	cd /home/geneweb/bases
+	cd /opt/geneweb/bases
 	hd=../gw/gw
 	killproc $hd/gwd
 	killproc $hd/gwsetup
@@ -43,8 +43,8 @@
 	;;
   restart)
 	echo -n "Restarting GeneWeb Services: "
-	mkdir -p /home/geneweb/bases
-	cd /home/geneweb/bases
+	mkdir -p /opt/geneweb/bases
+	cd /opt/geneweb/bases
 	hd=../gw/gw
         killproc $hd/gwd
         killproc $hd/gwsetup
diff -ruN geneweb-6.08/tools/Makefile.inc.unix geneweb-6.08-a/tools/Makefile.inc.unix
--- geneweb-6.08/tools/Makefile.inc.unix	2015-05-07 13:42:44.000000000 +0400
+++ geneweb-6.08-a/tools/Makefile.inc.unix	2015-05-26 20:03:50.129426431 +0400
@@ -3,10 +3,10 @@
 TOP=..
 CAMLP5_COMM=TOP=$(TOP) $(TOP)/tools/camlp5_comm.sh
 CAMLP5F=-DUNIX
-CAMLP5D=+camlp5
+CAMLP5D=/usr/local/lib/ocaml/camlp5
 LIBUNIX=-cclib -lunix
-OCAMLC=ocamlc.opt -warn-error A
-OCAMLOPT=ocamlopt.opt -warn-error A
+OCAMLC=ocamlc -warn-error A
+OCAMLOPT=ocamlopt -warn-error A
 OCAMLI=
 OCAMLD=
 STRIP=strip