diff --git a/net-misc/utm5/files/utm5_core b/net-misc/utm5/files/utm5_core
index 2e045bb..935192d 100755
--- a/net-misc/utm5/files/utm5_core
+++ b/net-misc/utm5/files/utm5_core
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -20,32 +20,18 @@ depend() {
 start() {
 	check_db_is_running || return 1
 	ebegin "Starting utm5_core"
-	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/safe_utm5_core.pid \
+	export LD_LIBRARY_PATH="/netup/utm5/lib"
+	start-stop-daemon --start --quiet --make-pidfile --pidfile /run/safe_utm5_core.pid \
 	--background --exec /netup/utm5/bin/safe_utm5_core -- start
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping safe_utm5_core"
-	start-stop-daemon --stop --quiet --signal 9 --pidfile /var/run/safe_utm5_core.pid
+	start-stop-daemon --stop --quiet --signal 9 --pidfile /run/safe_utm5_core.pid
 	eend $?
 	
 	ebegin "Stopping utm5_core"
-	killall -s USR1 utm5_core
-	
-	# Now we need to check that the processes are really stoped.
-	for i in 1 2 3 4 5 ; do
-		sleep 2
-		my_status=`ps aux | grep -v "grep utm5_core" | grep -v "stop" | grep utm5_core >/dev/null 2>&1; echo $?`
-		if [ "$my_status" = "1" ] ;then
-			echo -n "All process dead..."
-			break;
-		fi
-	done
-	my_status=`ps aux | grep -v "grep utm5_core" | grep -v "stop" | grep utm5_core >/dev/null 2>&1; echo $?`
-	if [ $my_status = "0" ] ; then
-		echo -n "Wated for 10 sec and no result... Killing!"
-		killall -9 utm5_core
-	fi
-	eend 0 
+	start-stop-daemon --stop --quiet --signal USR1 --pidfile /run/utm5_core.pid
+	eend $?
 }
diff --git a/net-misc/utm5/files/utm5_radius b/net-misc/utm5/files/utm5_radius
index cbcca1b..3eae430 100755
--- a/net-misc/utm5/files/utm5_radius
+++ b/net-misc/utm5/files/utm5_radius
@@ -1,16 +1,19 @@
 #!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 start() {
 	ebegin "Starting utm5_radius"
-	start-stop-daemon --start --quiet --background --exec /netup/utm5/bin/safe_utm5_radius -- start
+	export LD_LIBRARY_PATH="/netup/utm5/lib"
+	start-stop-daemon --start --quiet --background \
+		--pidfile /run/utm5_radius.pid \
+		--exec /netup/utm5/bin/safe_utm5_radius -- start
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping utm5_radius"
-	start-stop-daemon --start --quiet --exec /netup/utm5/bin/safe_utm5_radius -- stop
+	start-stop-daemon --stop --quiet --pidfile /run/utm5_radius.pid
 	eend $?
 }
diff --git a/net-misc/utm5/files/utm5_rfw b/net-misc/utm5/files/utm5_rfw
index e0d8f31..96f790e 100755
--- a/net-misc/utm5/files/utm5_rfw
+++ b/net-misc/utm5/files/utm5_rfw
@@ -63,6 +63,7 @@ start() {
 	then
 		eerror "Can not write into  $LOG_FILENAME. Please check permitions."
 	fi
+	export LD_LIBRARY_PATH="/netup/utm5/lib"
 	/bin/su $USERNAME -c "/netup/utm5/bin/utm5_rfw $ARGS -c /etc/utm5/rfw5.cfg >> $LOG_FILENAME 2>&1 &"
 	eend $?
 }