diff --git a/etc/init/ypclient.conf b/etc/init/ypclient.conf
index ce6af1f..58c0e96 100644
--- a/etc/init/ypclient.conf
+++ b/etc/init/ypclient.conf
@@ -17,16 +17,7 @@ pre-start script
 	else
 		exit 10
 	fi
-	if [ -f /etc/yp.conf ]; then
-		echo "" >/tmp/yp_options
-	else
-		echo "-broadcast" >/tmp/yp_options
-	fi
 end script
 
 expect daemon
-exec /usr/sbin/ypbind `cat /tmp/yp_options`
-
-post-start script
-	rm /tmp/yp_options
-end script
+exec /usr/sbin/start_ypbind 
diff --git a/usr/sbin/start_ypbind b/usr/sbin/start_ypbind
new file mode 100755
index 0000000..661a5d4
--- /dev/null
+++ b/usr/sbin/start_ypbind
@@ -0,0 +1,41 @@
+#!/bin/bash
+#Framework, welches ein komplettes Linux System aus den Sourcen erstellt
+#dieses Framework wird im CVS Repository
+#:pserver:cvs.tramp-bbs.de:/opt/cvs zur Verfügung gestellt
+#
+#Lage dieser Datei im Archiv: $HeadURL$
+#
+#(c) 2003 Harald Kueller, Germany
+#This program is free software; you can redistribute it and/or
+#modify ist under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either version
+#2 of the License, or (at your option) any later version.
+#
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#See the GNU General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not write to the Free Software Foundation,
+#Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+#Beschreibung:
+#Script zum Start von ypbind abhaengig vom
+#vorhandensein einer yp.conf in /etc.
+#ist yp.conf nicht vorhanden, soll bind broadcasts machen,
+#ansonsten sich mit dem in yp.conf genannten nis server verbinden.
+#
+#Aufrufparameter:
+#
+#Letzte Änderung von: $Author$
+#Datum der letzten Änderung: $Date$
+#Version der Datei: $Revision$
+#
+
+if [ -f /etc/yp.conf ]; then
+	exec ypbind
+else
+	exec ypbind -broadcast
+fi
+