diff --git a/etc/init/openvpn-down.conf b/etc/init/openvpn-down.conf
deleted file mode 100644
index dc4891c..0000000
--- a/etc/init/openvpn-down.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-description	"openvpn daemons startup"
-author		"Michael Freitag <Michael.Freitag@freitag-it.de>"
-version		1.0
-emits		none special
-
-stop on runlevel [016]
-
-console none
-
-exec pkill -f "openvpn --config"
-
-post-stop script
-                rmmod tun
-                if [ -f /dev/net/tun ]; then
-                        rm /dev/net/tun
-                fi
-end script
diff --git a/etc/init/openvpn-up.conf b/etc/init/openvpn-up.conf
deleted file mode 100644
index 1cdbc0d..0000000
--- a/etc/init/openvpn-up.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-description	"openvpn daemons startup"
-author		"Michael Freitag <Michael.Freitag@freitag-it.de>"
-version		1.0
-emits		none special
-
-start on (runlevel [2345] and (started rpc))
-
-console none
-
-pre-start script
-                modprobe tun
-                if [ ! -d /dev/net ]; then
-                        mkdir /dev/net 
-                fi
-                rm -f /dev/net/tun  && mknod /dev/net/tun c 10 200 
-
-                if [ ! -f /etc/sysconfig/net/openvpn/default.key ]; then
-                  openvpn --genkey --secret /etc/sysconfig/net/openvpn/default.key
-                fi
-end script
-
-script
-                cd /etc/sysconfig/net/openvpn
-                for CONFIG in `ls *.config`; do
-                  echo -n "..."$CONFIG | sed -e "s/.config//g"
-                  openvpn --config /etc/sysconfig/net/openvpn/$CONFIG &
-                done
-end script
diff --git a/etc/init/openvpn.conf b/etc/init/openvpn.conf
deleted file mode 100644
index 3e8e0dd..0000000
--- a/etc/init/openvpn.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-description	"openvpn daemons startup"
-author		"Michael Freitag <Michael.Freitag@freitag-it.de>"
-version		1.0
-emits		none special
-
-start on (runlevel [2345] and (started rpc))
-stop on runlevel [016]
-
-console none
-
-pre-start script
-                modprobe tun
-                if [ ! -d /dev/net ]; then
-                        mkdir /dev/net 
-                fi
-                rm -f /dev/net/tun  && mknod /dev/net/tun c 10 200 
-
-                if [ ! -f /etc/sysconfig/net/openvpn/default.key ]; then
-                  openvpn --genkey --secret /etc/sysconfig/net/openvpn/default.key
-                fi
-end script
-
-script
-                cd /etc/sysconfig/net/openvpn
-                for CONFIG in `ls *.config`; do
-                  echo -n "..."$CONFIG | sed -e "s/.config//g"
-                  openvpn --config /etc/sysconfig/net/openvpn/$CONFIG &
-                done
-end script
diff --git a/usr/share/doc/openvpn/Viitor/init/README.txt b/usr/share/doc/openvpn/Viitor/init/README.txt
new file mode 100644
index 0000000..6e0bd2d
--- /dev/null
+++ b/usr/share/doc/openvpn/Viitor/init/README.txt
@@ -0,0 +1,15 @@
+Initscripts for openvpn
+
+Server:
+copy openvpn-server.conf to /etc/init
+Be shure to have server.conf in /etc/sysconfig/net/openvpn
+ready.
+
+Client: 
+copy openserver-client-..servername...conf to /etc/init and replace ..servername.. by the servername
+  example: cp openserver-client-..servername...conf /etc/init/openserver-client-deepspace.conf
+edit the copied file and replace <servername> by the servername. 
+Be shure to have the config-file
+client-<servername>.conf in /etc/sysconfig/net/openvpn
+ready.
+
diff --git a/usr/share/doc/openvpn/Viitor/init/openvpn-client-..servername...conf b/usr/share/doc/openvpn/Viitor/init/openvpn-client-..servername...conf
new file mode 100644
index 0000000..a27936b
--- /dev/null
+++ b/usr/share/doc/openvpn/Viitor/init/openvpn-client-..servername...conf
@@ -0,0 +1,20 @@
+description	"openvpn daemons startup"
+author		"Michael Freitag <Michael.Freitag@freitag-it.de>"
+version		1.1
+emits		none special
+
+start on (runlevel [2345] and (started rpc))
+stop on runlevel [016]
+
+console none
+chdir /etc/sysconfig/net/openvpn/
+
+pre-start script
+                modprobe tun
+                if [ ! -d /dev/net ]; then
+                        mkdir /dev/net 
+                fi
+                rm -f /dev/net/tun  && mknod /dev/net/tun c 10 200 
+end script
+
+exec            /usr/sbin/openvpn --config client-<SERVERNAME>.conf
diff --git a/usr/share/doc/openvpn/Viitor/init/openvpn-server.conf b/usr/share/doc/openvpn/Viitor/init/openvpn-server.conf
new file mode 100644
index 0000000..9d1d778
--- /dev/null
+++ b/usr/share/doc/openvpn/Viitor/init/openvpn-server.conf
@@ -0,0 +1,20 @@
+description	"openvpn daemons startup"
+author		"Michael Freitag <Michael.Freitag@freitag-it.de>"
+version		1.1
+emits		none special
+
+start on (runlevel [2345] and (started rpc))
+stop on runlevel [016]
+
+console none
+chdir /etc/sysconfig/net/openvpn
+
+pre-start script
+                modprobe tun
+                if [ ! -d /dev/net ]; then
+                        mkdir /dev/net 
+                fi
+                rm -f /dev/net/tun  && mknod /dev/net/tun c 10 200 
+end script
+
+exec            openvpn --config server.conf