diff --git a/boinc-client-init-d b/boinc-client-init-d
index 79b5fd6..168fed3 100644
--- a/boinc-client-init-d
+++ b/boinc-client-init-d
@@ -67,11 +67,6 @@ BOINCCMD=/usr/bin/boinc_cmd
 LOGFILE=/var/log/boinc.log
 ERRORLOG=/var/log/boincerr.log
 
-# BOINC options: for the command line when running the client.  
-# Be aware that --allow_remote_gui_rpc opens up your machine to the world!
-#
-#BOINCOPTS="--allow_remote_gui_rpc"   
-BOINCOPTS="--daemon"
 
 # Subsys lock file ...
 
@@ -122,6 +117,12 @@ if [ ! -d $BOINCDIR ]; then
   exit 7
 fi
 
+# BOINC options: for the command line when running the client.  
+# Be aware that --allow_remote_gui_rpc opens up your machine to the world!
+#
+#BOINCOPTS="--allow_remote_gui_rpc"   
+BOINCOPTS="--daemon --dir $BOINCDIR"
+
 
 # Some additional places to look for the client executable
 # (Should do this after init.d/functions and sysconfig/boinc, which sets PATH)
@@ -152,7 +153,7 @@ fi
 ## Functions: $1 is one of  start|stop|status|reload|restart
 
 case "$1" in
-  start)          
+  start) 
 	cd $BOINCDIR
 
         if [ ! -d projects ] ; then
diff --git a/boinc-client.spec b/boinc-client.spec
index 4a1bb37..372fb5d 100644
--- a/boinc-client.spec
+++ b/boinc-client.spec
@@ -4,7 +4,7 @@
 Summary:	The BOINC client core
 Name:		boinc-client
 Version:	6.2.15
-Release:	1.%{snap}svn%{?dist}
+Release:	2.%{snap}svn%{?dist}
 License:	LGPLv2+
 Group:		Applications/Engineering
 URL:		http://boinc.berkeley.edu/
@@ -270,6 +270,9 @@ fi
 %{_includedir}/BOINC/*
 
 %changelog
+* Sat Dec 13 2008 Milos Jakubicek <xjakub@fi.muni.cz> - 6.2.15-2.20080818svn
+- Fix usage of $BOINCDIR in the init script
+
 * Tue Aug 19 2008 Milos Jakubicek <xjakub@fi.muni.cz> - 6.2.15-1.20080818svn
 - Update to 6.2.15
 - Removed the 'noexec' script (fixed upstream)