diff --git a/Gemfile b/Gemfile
index b891dec..6637800 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 gem 'omnibus', '~> 3.0.0'
 gem 'omnibus-software', :git => 'git://github.com/opscode/omnibus-software.git', :branch => 'master'
+gem 'ohai'
diff --git a/Gemfile.lock b/Gemfile.lock
index 94d7c63..a72e295 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -66,5 +66,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  ohai
   omnibus (~> 3.0.0)
   omnibus-software!
diff --git a/Makefile b/Makefile
index 51685c2..b089641 100644
--- a/Makefile
+++ b/Makefile
@@ -2,11 +2,12 @@ PROJECT=gitlab
 RELEASE_BUCKET=downloads-packages
 RELEASE_BUCKET_REGION=eu-west-1
 SECRET_DIR:=$(shell openssl rand -hex 20)
+PLATFORM_DIR:=$(shell ohai platform | ruby -rjson -e 'puts JSON.parse(ARGF.read).first')
 
 build:
 	OMNIBUS_APPEND_TIMESTAMP=0 bin/omnibus build project ${PROJECT}
 
-release: no_changes on_tag purge build sync
+release: no_changes on_tag purge build move_to_platform_dir sync
 
 no_changes:
 	git diff --quiet HEAD
@@ -19,6 +20,12 @@ purge:
 	mkdir -p pkg
 	(cd pkg && find . -delete)
 
+# Instead of pkg/gitlab-xxx.deb, put all files in pkg/ubuntu/gitlab-xxx.deb
+move_to_platform_dir:
+	mv pkg ${PLATFORM_DIR}
+	mkdir pkg
+	mv ${PLATFORM_DIR} pkg/
+
 sync: remove_json move_ee_to_secret_dir md5 s3_sync
 
 remove_json:
--
libgit2 0.21.2