diff --git a/scripts/start.sh b/scripts/start.sh
deleted file mode 100755
index 9c05dc97e..000000000
--- a/scripts/start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -
-# Copyright 2014 The Gogs Authors. All rights reserved.
-# Use of this source code is governed by a MIT-style
-# license that can be found in the LICENSE file.
-#
-# MUST EXECUTE THIS AT ROOT DIRECTORY: ./scripts/start.sh
-#
-IFS='
-	'
-PATH=/bin:/usr/bin:/usr/local/bin
-USER=$(whoami)
-HOME=$(grep "^$USER:" /etc/passwd | cut -d: -f6)
-export USER HOME PATH
-
-cd "$(dirname "$0")/.." && exec ./gogs web
diff --git a/scripts/systemd/gogs.service b/scripts/systemd/gogs.service
index 1fa0b82ae..7436e46ae 100644
--- a/scripts/systemd/gogs.service
+++ b/scripts/systemd/gogs.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Gogs (Go Git Service) server
+Description=Gogs (Go Git Service)
 After=syslog.target
 After=network.target
 #After=mysqld.service
@@ -11,8 +11,10 @@ After=network.target
 Type=simple
 User=git
 Group=git
-ExecStart=/home/git/gogs/gogs/start.sh
 WorkingDirectory=/home/git/gogs
+ExecStart=/home/git/gogs/gogs web
+Restart=always
+Environment="USER=git","HOME=/home/git"
 
 [Install]
 WantedBy=multi-user.target