diff --git a/nginx/templates/upstart.jinja b/nginx/templates/upstart.jinja
index 3257cbe..f0cc377 100644
--- a/nginx/templates/upstart.jinja
+++ b/nginx/templates/upstart.jinja
@@ -1,8 +1,23 @@
-# startup script for Nginx
-
-respawn
-
-start on filesystem or runlevel [2345]
+# nginx
+ 
+description "nginx http daemon"
+author "George Shammas <georgyo@gmail.com>"
+ 
+start on (filesystem and net-device-up IFACE=lo)
 stop on runlevel [!2345]
-
-exec /usr/sbin/nginx -c /etc/nginx/nginx.conf
+ 
+env DAEMON=/usr/sbin/nginx
+ 
+expect fork
+respawn
+respawn limit 10 5
+#oom never
+ 
+pre-start script
+        $DAEMON -t
+        if [ $? -ne 0 ]
+                then exit $?
+        fi
+end script
+ 
+exec $DAEMON