diff --git a/debian/adduser.sh b/debian/adduser.sh
index 44d2fa05ee..1312597aa1 100755
--- a/debian/adduser.sh
+++ b/debian/adduser.sh
@@ -8,7 +8,7 @@ test -n "${gitlab_user}" || gitlab_user="gitlab"
 
 # Create gitlab user with home in /var/lib
 echo "Creating/updating ${gitlab_user} user account..."
-adduser --home /var/lib/${gitlab_user} --gecos "${gitlab_user} user" --shell /bin/sh \
+adduser --system --home /var/lib/${gitlab_user} --gecos "${gitlab_user} user" --shell /bin/sh \
 	--quiet --disabled-password ${gitlab_user} || {
 echo "Proceeding with existing ${gitlab_user} user..."
   }
diff --git a/debian/changelog b/debian/changelog
index 6a70c7a2bc..dd1cb2f21b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gitlab (8.9.0+dfsg-9) UNRELEASED; urgency=medium
+
+  * Create gitlab user as system user (Closes: #834037) 
+
+ -- Pirate Praveen <praveen@debian.org>  Sat, 13 Aug 2016 17:09:52 +0530
+
 gitlab (8.9.0+dfsg-8) unstable; urgency=medium
 
   * Update ruby-unicorn-worker-killer dependency