diff --git a/ypserv-yppasswdd.init b/ypserv-yppasswdd.init
index cf3eaa1..03258b6 100644
--- a/ypserv-yppasswdd.init
+++ b/ypserv-yppasswdd.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # yppasswdd:    Starts the yp-passwdd, the YP password changing server
 #
@@ -12,13 +12,8 @@
 # processname: rpc.yppasswdd
 
 # Source function library.
-if [ -f /etc/init.d/functions ] ; then
-        . /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-        . /etc/rc.d/init.d/functions
-else
-        exit 0
-fi
+[ -f /etc/rc.d/init.d/functions ] || exit 0
+. /etc/rc.d/init.d/functions
 
 # getting the YP-Domainname
 . /etc/sysconfig/network
@@ -26,7 +21,7 @@ fi
 RETVAL=0
 
 start() {
-        echo -n "Starting YP passwd service: "
+        echo -n $"Starting YP passwd service: "
         daemon rpc.yppasswdd
         RETVAL=$?
         echo
@@ -35,7 +30,7 @@ start() {
 }
 
 stop() {
-        echo -n "Stopping YP passwd service: "
+        echo -n $"Stopping YP passwd service: "
         killproc rpc.yppasswdd
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/yppasswdd
@@ -65,9 +60,8 @@ case "$1" in
 	fi
 	;;
   *)
-	echo "Usage: $0 {start|stop|status|restart|reload|condrestart}"
+	echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}"
 	exit 1
 esac
 
 exit $RETVAL
-
diff --git a/ypserv-ypserv.init b/ypserv-ypserv.init
index 50e3825..e4bc608 100644
--- a/ypserv-ypserv.init
+++ b/ypserv-ypserv.init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # ypserv:       Starts the yp-server
 #
@@ -6,7 +6,7 @@
 #
 # Author:       Joerg Mertin <smurphy@stargate.bln.sub.org>
 #
-# chkconfig: - 16 84
+# chkconfig: - 26 74
 # description: ypserv is an implementation of the standard NIS/YP networking \
 #              protocol.  It allows network-wide distribution of hostname, \
 #              username, and other information databases. This is the NIS \
@@ -15,13 +15,8 @@
 # config: /etc/ypserv.conf
 
 # Source function library.
-if [ -f /etc/init.d/functions ] ; then
-	. /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ] ; then
-	. /etc/rc.d/init.d/functions
-else
-	exit 0
-fi
+[ -f /etc/rc.d/init.d/functions ] || exit 0
+. /etc/rc.d/init.d/functions
 
 # getting the YP-Domainname
 . /etc/sysconfig/network
@@ -29,7 +24,7 @@ fi
 RETVAL=0
 
 start() {
-	echo -n "Starting YP server services: "
+	echo -n $"Starting YP server services: "
         daemon ypserv
         RETVAL=$?
         echo
@@ -38,7 +33,7 @@ start() {
 }
 
 stop() {
-        echo -n "Stopping YP server services: "
+        echo -n $"Stopping YP server services: "
         killproc ypserv
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ypserv
@@ -68,9 +63,8 @@ case "$1" in
 	fi
 	;;
   *)
-	echo "Usage: $0 {start|stop|status|restart|condrestart}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart}"
 	exit 1
 esac
 
 exit $RETVAL
-
diff --git a/ypserv.spec b/ypserv.spec
index 2d33eb3..2176a6c 100644
--- a/ypserv.spec
+++ b/ypserv.spec
@@ -4,13 +4,13 @@ Summary: The NIS (Network Information Service) server.
 Url: http://www.suse.de/~kukuk
 Name: ypserv
 Version: 1.3.11
-Release: 9
+Release: 13
 Copyright: GNU
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.gz
 Source1: ypserv-ypserv.init
 Source2: ypserv-yppasswdd.init
-Requires: portmap tcp_wrappers
+Requires: make, portmap, tcp_wrappers, bash >= 2.0
 Prereq: /sbin/chkconfig /sbin/service
 Patch0: ypserv-1.3.11-redhat.patch
 Patch1: ypserv-1.3.9-ndbmkey.patch
@@ -35,6 +35,7 @@ Install ypserv if you need an NIS server for your network.  You'll
 also need to install the yp-tools and ypbind packages onto any NIS
 client machines.
 
+
 %prep
 %setup -q
 %patch0 -p0
@@ -90,7 +91,6 @@ fi
 %doc etc/ypserv.conf etc/securenets etc/README.etc
 %config %{_sysconfdir}/ypserv.conf
 %config /var/yp/*
-%dir /var/yp
 %config %{initdir}/*
 %{_libdir}/yp
 %{_sbindir}/*
@@ -98,6 +98,18 @@ fi
 %{_includedir}/*/*
 
 %changelog
+* Thu Mar 15 2001 Philipp Knirsch <pknirsch@redhat.com>
+- Added missing make requirement
+
+* Tue Feb 27 2001 Preston Brown <pbrown@redhat.com>
+- don't own dir /var/yp
+
+* Wed Jan 24 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- prepare for startup script translation
+
+* Thu Jan 11 2001 Bernhard Rosenkraenzer <bero@redhat.com>
+- Start after netfs (#23527)
+
 * Wed Aug 16 2000 Than Ngo <than@redhat.com>
 - fix typo in startup script (Bug #15999)