diff --git a/debian/database.yml b/debian/conf/database.yml
similarity index 100%
rename from debian/database.yml
rename to debian/conf/database.yml
diff --git a/debian/gitlab-debian.conf b/debian/conf/gitlab-debian.conf
similarity index 100%
rename from debian/gitlab-debian.conf
rename to debian/conf/gitlab-debian.conf
diff --git a/debian/gitlab.yml b/debian/conf/gitlab.yml
similarity index 100%
rename from debian/gitlab.yml
rename to debian/conf/gitlab.yml
diff --git a/debian/install b/debian/install
index 40b91538aa..8749b1218d 100644
--- a/debian/install
+++ b/debian/install
@@ -1,8 +1,8 @@
 debian/conf/gitlab etc/default
 debian/conf/unicorn.rb etc/gitlab
-debian/database.yml etc/gitlab
-debian/gitlab.yml etc/gitlab
-debian/gitlab-debian.conf etc/gitlab
+debian/conf/database.yml etc/gitlab
+debian/conf/gitlab.yml etc/gitlab
+debian/conf/gitlab-debian.conf etc/gitlab
 debian/adduser.sh usr/lib/gitlab/scripts
 debian/grantpriv.sh usr/lib/gitlab/scripts
 debian/rake-tasks.sh usr/lib/gitlab/scripts