diff --git a/debian/changelog b/debian/changelog
index 059b42f9ca..82bf0d0c9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gitlab (8.9.0+dfsg~rc4-1) UNRELEASED; urgency=medium
   * New upstream release candidate
   * Refresh patches
   * Use jquery in place of jquery2 (debian has only jquery and it has same API)
+  * Remove /etc/gitlab/initializers/devise_async.rb (removed upstream)
 
  -- Pirate Praveen <praveen@debian.org>  Thu, 16 Jun 2016 21:51:02 +0530
 
diff --git a/debian/rake-tasks.sh b/debian/rake-tasks.sh
index cbc78c62bd..8369be166c 100755
--- a/debian/rake-tasks.sh
+++ b/debian/rake-tasks.sh
@@ -19,6 +19,9 @@ if ! [ -f "${gitlab_app_root}/config/secrets.yml" ]; then
 
 fi
 
+# Remove config files (already removed by upstream)
+rm -rf /etc/gitlab/initializers/devise_async.rb
+
 # Check if the db is already present
 if [ "$(LANG=C su postgres -c "psql gitlab_production -c \"\d\"")" = \
 "No relations found." ]; then