diff --git a/Makefile b/Makefile
index b994214..a285f4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,17 @@
+packages = $(shell basename --suffix=.spec specs/*/*.spec)
+
 all:
 	@echo "Usage:"
 	@echo
-	@echo 'make gitlab       # uploads gitlab.spec to obs'
-	@echo 'make gitlab-shell # uploads gitlab-shell.spec to obs'
-
-gitlab gitlab-shell:
-	$(MAKE) upload PACKAGE=$@
+	@for pkg in $(packages); do printf 'make %-20s # uploads %s.spec to obs\n' $$pkg $$pkg; done
 
-obs_project = isv:spb:gitlab
+$(packages):
+	@spec=$$(find specs/ -name $@.spec); \
+		project=isb:spb:$$(basename $$(dirname $$spec)); \
+		$(MAKE) upload package=$@ spec=$$spec project=$$project
 
 upload:
-	test -n "$(PACKAGE)"
 	mkdir -p obs
-	if test -d obs/$(obs_project)/$(PACKAGE); then (cd obs/$(obs_project)/$(PACKAGE) && osc update); else (cd obs && osc checkout $(obs_project) $(PACKAGE)); fi
-	cp $(PACKAGE).spec obs/isv:spb:gitlab/$(PACKAGE)/
-	cd obs/isv:spb:gitlab/$(PACKAGE) && osc commit -m 'Update $(PACKAGE)'
+	if test -d obs/$(project)/$(package); then (cd obs/$(project)/$(package) && osc update); else (cd obs && osc checkout $(project) $(PACKAGE)); fi
+	cp $(spec) obs/$(project)/$(package)/
+	cd obs/$(project)/$(PACKAGE) && osc commit -m 'Update $(package)'
diff --git a/gitlab-shell.spec b/gitlab-shell.spec
deleted file mode 100644
index e40845d..0000000
--- a/gitlab-shell.spec
+++ /dev/null
@@ -1,83 +0,0 @@
-Name:		gitlab-shell
-Version:	2.4.0
-Release:	2%{?dist}
-Summary:	Software Development Platform
-
-Group:		Development/Tools
-License:	Expat
-URL:		https://gitlab.com/gitlab-org/gitlab-shell
-Source0:	%{name}-%{version}.tar.gz
-BuildArch:	noarch
-
-# BuildRequires:
-Requires:	ruby >= 1.9, redis
-
-%description
-Gitlab-shell
-
-%prep
-%setup -q
-
-%build
-cat > config.yml <<EOF
-user: git
-gitlab_url: "http://localhost:8080/"
-
-http_settings:
-#  user: someone
-#  password: somepass
-#  ca_file: /etc/ssl/cert.pem
-#  ca_path: /etc/pki/tls/certs
-  self_signed_cert: false
-
-repos_path: "/var/lib/gitlab/repositories/"
-auth_file: "/var/lib/gitlab-shell/.ssh/authorized_keys"
-
-redis:
-  bin: /usr/bin/redis-cli
-  host: 127.0.0.1
-  port: 6379
-  # pass: redispass # Allows you to specify the password for Redis
-  #database: 0
-  #socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP
-  #namespace: resque:gitlab
-
-log_file: "/var/log/gitlab-shell/gitlab-shell.log"
-log_level: INFO
-audit_usernames: false
-EOF
-
-%install
-mkdir -p %{buildroot}/usr/lib/gitlab-shell
-mkdir -p %{buildroot}/etc/gitlab-shell
-
-mv config.yml %{buildroot}/etc/gitlab-shell
-ln -s /etc/gitlab-shell/config.yml %{buildroot}/usr/lib/gitlab-shell/
-
-cp -r .  %{buildroot}/usr/lib/gitlab-shell
-
-%post
-groupadd git || true
-if ! id git; then
-  adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git
-fi
-
-mkdir -p /var/log/gitlab-shell
-mkdir -p /var/lib/gitlab-shell/.ssh
-
-ln -s /var/lib/gitlab-shell/.ssh /usr/lib/gitlab/.ssh
-
-chown -R git:git /var/log/gitlab-shell
-chown -R git:git /var/lib/gitlab-shell
-
-ln -s /var/lib/gitlab/.gitlab_shell_secret /usr/lib/gitlab-shell/.gitlab_shell_secret
-
-sudo -u git -H /usr/lib/gitlab-shell/bin/install
-
-%files
-/usr/lib/gitlab-shell
-/etc/gitlab-shell
-
-
-%changelog
-
diff --git a/gitlab.spec b/gitlab.spec
deleted file mode 100644
index c4b1652..0000000
--- a/gitlab.spec
+++ /dev/null
@@ -1,143 +0,0 @@
-Name:    gitlab
-Version: 7.6.2
-Release: 4%{?dist}
-Summary: Software Development Platform
-Group:   Development/Tools
-License: Expat
-URL:     https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab
-Source0: %{name}-%{version}.tar.gz
-BuildArch: noarch
-BuildRequires: gitlab-deps
-Requires: gitlab-deps, gitlab-shell, git
-
-%description
-GitLab
-
-%prep
-%setup -q
-#%patch0 -p 1
-
-%build
-cat > config/gitlab.yml <<EOF
-production: &base
-  gitlab:
-    host: localhost
-    port: 80 # Set to 443 if using HTTPS
-    https: false # Set to true if using HTTPS
-    email_from: example@example.com
-    default_projects_limit: 10
-    default_projects_features:
-      issues: true
-      merge_requests: true
-      wiki: true
-      snippets: false
-      visibility_level: "private"  # can be "private" | "internal" | "public"
-  gravatar:
-    enabled: true
-    plain_url: "http://cdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
-    ssl_url: "https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
-  omniauth:
-    # Allow login via Twitter, Google, etc. using OmniAuth providers
-    enabled: false
-    allow_single_sign_on: false
-    block_auto_created_users: true
-    providers:
-      # - { name: 'google_oauth2', app_id: 'YOUR APP ID',
-      #     app_secret: 'YOUR APP SECRET',
-      #     args: { access_type: 'offline', approval_prompt: '' } }
-  satellites:
-    path: /var/lib/gitlab/satellites
-    timeout: 30
-  backup:
-    path: /var/lib/gitlab/backups
-  gitlab_shell:
-    path: /usr/lib/gitlab-shell
-    repos_path: /var/lib/gitlab/repositories/
-    hooks_path: /usr/lib/gitlab-shell/hooks/
-    # Git over HTTP
-    upload_pack: true
-    receive_pack: true
-  git:
-    bin_path: /usr/bin/git
-    max_size: 20971520 # 20.megabytes
-    timeout: 10
-  extra:
-    ## Piwik analytics.
-    # piwik_url: '_your_piwik_url'
-    # piwik_site_id: '_your_piwik_site_id'
-
-    ## Text under sign-in page (Markdown enabled)
-    # sign_in_text: |
-    #   ![Company Logo](http://www.companydomain.com/logo.png)
-    #   [Learn more about CompanyName](http://www.companydomain.com/)
-EOF
-
-%install
-mkdir -p                          %{buildroot}/etc/gitlab
-mv config/gitlab.yml              %{buildroot}/etc/gitlab/gitlab.yml
-cp config/unicorn.rb.example      %{buildroot}/etc/gitlab/unicorn.rb
-cp config/database.yml.postgresql %{buildroot}/etc/gitlab/database.yml 
-
-sed -i 's/\/home\/\git/\/usr\/lib/' %{buildroot}/etc/gitlab/unicorn.rb
-
-mkdir -p %{buildroot}/usr/lib/gitlab
-cp -r app bin config config.ru db doc GITLAB_SHELL_VERSION lib Procfile public Rakefile vendor VERSION %{buildroot}/usr/lib/gitlab/
-mv %{buildroot}/usr/lib/gitlab/config/initializers/rack_attack.rb.example %{buildroot}/usr/lib/gitlab/config/initializers/rack_attack.rb
-for configfile in gitlab.yml unicorn.rb database.yml; do
-  ln -s /etc/gitlab/$configfile %{buildroot}/usr/lib/gitlab/config
-done
-ln -s /var/log/gitlab      %{buildroot}/usr/lib/gitlab/log
-ln -s /var/lib/gitlab/tmp  %{buildroot}/usr/lib/gitlab/tmp
-ln -s /var/lib/gitlab/.gitlab_shell_secret %{buildroot}/usr/lib/gitlab/.gitlab_shell_secret
-ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret
-ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets
-
-%post
-groupadd git || true
-if ! id git; then
-  adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git
-fi
-if [ -x /usr/bin/postgres ]; then
-  service postgresql initdb || true
-  service postgresql start
-  sudo -u postgres createuser --createdb git || true
-fi
-mkdir -p /var/log/gitlab
-chown -R git:git /var/log/gitlab
-mkdir -p /var/lib/gitlab/backups
-mkdir -p /var/lib/gitlab/repositories
-mkdir -p /var/lib/gitlab/satellites
-mkdir -p /var/lib/gitlab/tmp
-touch /var/lib/gitlab/.gitconfig
-ln -s /var/lib/gitlab/.gitconfig /usr/lib/gitlab/.gitconfig
-chown -R git:git /var/lib/gitlab
-chmod u+rwx,g=rx,o-rwx /var/lib/gitlab/satellites
-
-if [ /usr/bin/redis-server ]; then
-  service redis start
-fi
-
-sudo -u git -H "/usr/bin/git" config --global user.name  "GitLab"
-sudo -u git -H "/usr/bin/git" config --global user.email "example@example.com"
-sudo -u git -H "/usr/bin/git" config --global core.autocrlf "input"
-
-mkdir -p /var/lib/gitlab-assets
-
-cd /usr/lib/gitlab/
-yes yes | sudo -u git bundle exec rake gitlab:setup RAILS_ENV=production
-bundle exec rake assets:precompile RAILS_ENV=production
-
-cp /usr/lib/gitlab/lib/support/init.d/gitlab /etc/init.d/gitlab
-cp /usr/lib/gitlab/lib/support/init.d/gitlab.default.example /etc/default/gitlab
-cp /usr/lib/gitlab/lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
-
-sed -i 's/app_root="\/home\/\$app_user\/gitlab"/app_root="\/usr\/lib\/gitlab"/' /etc/default/gitlab
-sed -i 's/\/home\/\git/\/usr\/lib/' /etc/logrotate.d/gitlab
-
-%postun
-service gitlab stop
-
-%files
-/usr/lib/gitlab
-/etc/gitlab
-%doc
diff --git a/specs/gitlab/gitlab-shell.spec b/specs/gitlab/gitlab-shell.spec
new file mode 100644
index 0000000..e40845d
--- /dev/null
+++ b/specs/gitlab/gitlab-shell.spec
@@ -0,0 +1,83 @@
+Name:		gitlab-shell
+Version:	2.4.0
+Release:	2%{?dist}
+Summary:	Software Development Platform
+
+Group:		Development/Tools
+License:	Expat
+URL:		https://gitlab.com/gitlab-org/gitlab-shell
+Source0:	%{name}-%{version}.tar.gz
+BuildArch:	noarch
+
+# BuildRequires:
+Requires:	ruby >= 1.9, redis
+
+%description
+Gitlab-shell
+
+%prep
+%setup -q
+
+%build
+cat > config.yml <<EOF
+user: git
+gitlab_url: "http://localhost:8080/"
+
+http_settings:
+#  user: someone
+#  password: somepass
+#  ca_file: /etc/ssl/cert.pem
+#  ca_path: /etc/pki/tls/certs
+  self_signed_cert: false
+
+repos_path: "/var/lib/gitlab/repositories/"
+auth_file: "/var/lib/gitlab-shell/.ssh/authorized_keys"
+
+redis:
+  bin: /usr/bin/redis-cli
+  host: 127.0.0.1
+  port: 6379
+  # pass: redispass # Allows you to specify the password for Redis
+  #database: 0
+  #socket: /var/run/redis/redis.sock # Comment out this line if you want to use TCP
+  #namespace: resque:gitlab
+
+log_file: "/var/log/gitlab-shell/gitlab-shell.log"
+log_level: INFO
+audit_usernames: false
+EOF
+
+%install
+mkdir -p %{buildroot}/usr/lib/gitlab-shell
+mkdir -p %{buildroot}/etc/gitlab-shell
+
+mv config.yml %{buildroot}/etc/gitlab-shell
+ln -s /etc/gitlab-shell/config.yml %{buildroot}/usr/lib/gitlab-shell/
+
+cp -r .  %{buildroot}/usr/lib/gitlab-shell
+
+%post
+groupadd git || true
+if ! id git; then
+  adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git
+fi
+
+mkdir -p /var/log/gitlab-shell
+mkdir -p /var/lib/gitlab-shell/.ssh
+
+ln -s /var/lib/gitlab-shell/.ssh /usr/lib/gitlab/.ssh
+
+chown -R git:git /var/log/gitlab-shell
+chown -R git:git /var/lib/gitlab-shell
+
+ln -s /var/lib/gitlab/.gitlab_shell_secret /usr/lib/gitlab-shell/.gitlab_shell_secret
+
+sudo -u git -H /usr/lib/gitlab-shell/bin/install
+
+%files
+/usr/lib/gitlab-shell
+/etc/gitlab-shell
+
+
+%changelog
+
diff --git a/specs/gitlab/gitlab.spec b/specs/gitlab/gitlab.spec
new file mode 100644
index 0000000..c4b1652
--- /dev/null
+++ b/specs/gitlab/gitlab.spec
@@ -0,0 +1,143 @@
+Name:    gitlab
+Version: 7.6.2
+Release: 4%{?dist}
+Summary: Software Development Platform
+Group:   Development/Tools
+License: Expat
+URL:     https://beta.softwarepublico.gov.br/gitlab/softwarepublico/gitlab
+Source0: %{name}-%{version}.tar.gz
+BuildArch: noarch
+BuildRequires: gitlab-deps
+Requires: gitlab-deps, gitlab-shell, git
+
+%description
+GitLab
+
+%prep
+%setup -q
+#%patch0 -p 1
+
+%build
+cat > config/gitlab.yml <<EOF
+production: &base
+  gitlab:
+    host: localhost
+    port: 80 # Set to 443 if using HTTPS
+    https: false # Set to true if using HTTPS
+    email_from: example@example.com
+    default_projects_limit: 10
+    default_projects_features:
+      issues: true
+      merge_requests: true
+      wiki: true
+      snippets: false
+      visibility_level: "private"  # can be "private" | "internal" | "public"
+  gravatar:
+    enabled: true
+    plain_url: "http://cdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
+    ssl_url: "https://seccdn.libravatar.org/avatar/%{hash}?s=%{size}&d=identicon"
+  omniauth:
+    # Allow login via Twitter, Google, etc. using OmniAuth providers
+    enabled: false
+    allow_single_sign_on: false
+    block_auto_created_users: true
+    providers:
+      # - { name: 'google_oauth2', app_id: 'YOUR APP ID',
+      #     app_secret: 'YOUR APP SECRET',
+      #     args: { access_type: 'offline', approval_prompt: '' } }
+  satellites:
+    path: /var/lib/gitlab/satellites
+    timeout: 30
+  backup:
+    path: /var/lib/gitlab/backups
+  gitlab_shell:
+    path: /usr/lib/gitlab-shell
+    repos_path: /var/lib/gitlab/repositories/
+    hooks_path: /usr/lib/gitlab-shell/hooks/
+    # Git over HTTP
+    upload_pack: true
+    receive_pack: true
+  git:
+    bin_path: /usr/bin/git
+    max_size: 20971520 # 20.megabytes
+    timeout: 10
+  extra:
+    ## Piwik analytics.
+    # piwik_url: '_your_piwik_url'
+    # piwik_site_id: '_your_piwik_site_id'
+
+    ## Text under sign-in page (Markdown enabled)
+    # sign_in_text: |
+    #   ![Company Logo](http://www.companydomain.com/logo.png)
+    #   [Learn more about CompanyName](http://www.companydomain.com/)
+EOF
+
+%install
+mkdir -p                          %{buildroot}/etc/gitlab
+mv config/gitlab.yml              %{buildroot}/etc/gitlab/gitlab.yml
+cp config/unicorn.rb.example      %{buildroot}/etc/gitlab/unicorn.rb
+cp config/database.yml.postgresql %{buildroot}/etc/gitlab/database.yml 
+
+sed -i 's/\/home\/\git/\/usr\/lib/' %{buildroot}/etc/gitlab/unicorn.rb
+
+mkdir -p %{buildroot}/usr/lib/gitlab
+cp -r app bin config config.ru db doc GITLAB_SHELL_VERSION lib Procfile public Rakefile vendor VERSION %{buildroot}/usr/lib/gitlab/
+mv %{buildroot}/usr/lib/gitlab/config/initializers/rack_attack.rb.example %{buildroot}/usr/lib/gitlab/config/initializers/rack_attack.rb
+for configfile in gitlab.yml unicorn.rb database.yml; do
+  ln -s /etc/gitlab/$configfile %{buildroot}/usr/lib/gitlab/config
+done
+ln -s /var/log/gitlab      %{buildroot}/usr/lib/gitlab/log
+ln -s /var/lib/gitlab/tmp  %{buildroot}/usr/lib/gitlab/tmp
+ln -s /var/lib/gitlab/.gitlab_shell_secret %{buildroot}/usr/lib/gitlab/.gitlab_shell_secret
+ln -s /var/lib/gitlab/.secret %{buildroot}/usr/lib/gitlab/.secret
+ln -s /var/lib/gitlab-assets %{buildroot}/usr/lib/gitlab/public/assets
+
+%post
+groupadd git || true
+if ! id git; then
+  adduser --system --home-dir /usr/lib/gitlab --no-create-home --gid git git
+fi
+if [ -x /usr/bin/postgres ]; then
+  service postgresql initdb || true
+  service postgresql start
+  sudo -u postgres createuser --createdb git || true
+fi
+mkdir -p /var/log/gitlab
+chown -R git:git /var/log/gitlab
+mkdir -p /var/lib/gitlab/backups
+mkdir -p /var/lib/gitlab/repositories
+mkdir -p /var/lib/gitlab/satellites
+mkdir -p /var/lib/gitlab/tmp
+touch /var/lib/gitlab/.gitconfig
+ln -s /var/lib/gitlab/.gitconfig /usr/lib/gitlab/.gitconfig
+chown -R git:git /var/lib/gitlab
+chmod u+rwx,g=rx,o-rwx /var/lib/gitlab/satellites
+
+if [ /usr/bin/redis-server ]; then
+  service redis start
+fi
+
+sudo -u git -H "/usr/bin/git" config --global user.name  "GitLab"
+sudo -u git -H "/usr/bin/git" config --global user.email "example@example.com"
+sudo -u git -H "/usr/bin/git" config --global core.autocrlf "input"
+
+mkdir -p /var/lib/gitlab-assets
+
+cd /usr/lib/gitlab/
+yes yes | sudo -u git bundle exec rake gitlab:setup RAILS_ENV=production
+bundle exec rake assets:precompile RAILS_ENV=production
+
+cp /usr/lib/gitlab/lib/support/init.d/gitlab /etc/init.d/gitlab
+cp /usr/lib/gitlab/lib/support/init.d/gitlab.default.example /etc/default/gitlab
+cp /usr/lib/gitlab/lib/support/logrotate/gitlab /etc/logrotate.d/gitlab
+
+sed -i 's/app_root="\/home\/\$app_user\/gitlab"/app_root="\/usr\/lib\/gitlab"/' /etc/default/gitlab
+sed -i 's/\/home\/\git/\/usr\/lib/' /etc/logrotate.d/gitlab
+
+%postun
+service gitlab stop
+
+%files
+/usr/lib/gitlab
+/etc/gitlab
+%doc
--
libgit2 0.21.2