diff --git a/golang-github-docker-libcontainer.spec b/golang-github-docker-libcontainer.spec
index a021fc6..dbf15ff 100644
--- a/golang-github-docker-libcontainer.spec
+++ b/golang-github-docker-libcontainer.spec
@@ -9,7 +9,7 @@
 
 Name:           golang-github-docker-libcontainer
 Version:        1.4.0
-Release:        1.git%{shortcommit}%{?dist}
+Release:        2.git%{shortcommit}%{?dist}
 Summary:        Configuration options for containers
 License:        ASL 2.0
 URL:            https://%{import_path}
@@ -23,7 +23,7 @@ BuildRequires:  golang(github.com/docker/docker/pkg/mount)
 BuildRequires:  golang(github.com/docker/docker/pkg/symlink)
 BuildRequires:  golang(github.com/docker/docker/pkg/term)
 BuildRequires:  golang(github.com/syndtr/gocapability/capability)
-Provides:       nsinit
+Provides:       nsinit = %{version}-%{release}
 
 %description
 libcontainer specifies configuration options for what a container is. It
@@ -35,11 +35,23 @@ This package provides the nsinit binary as well, but it is currently for
 debugging purposes only and not officially supported.
 
 %package devel
+Summary:        Configuration options for containers
 BuildRequires:  golang >= 1.2.1-3
-BuildRequires:  golang(github.com/syndtr/gocapability/capability)
+BuildRequires:	golang(github.com/codegangsta/cli)
+BuildRequires:	golang(github.com/coreos/go-systemd/dbus)
+BuildRequires:	golang(github.com/docker/docker/pkg/mount)
+BuildRequires:	golang(github.com/docker/docker/pkg/symlink)
+BuildRequires:	golang(github.com/docker/docker/pkg/term)
+BuildRequires:	golang(github.com/godbus/dbus)
+BuildRequires:	golang(github.com/syndtr/gocapability/capability)
 Requires:       golang >= 1.2.1-3
-Requires:       golang(github.com/syndtr/gocapability/capability)
-Summary:        Configuration options for containers
+Requires:	golang(github.com/codegangsta/cli)
+Requires:	golang(github.com/coreos/go-systemd/dbus)
+Requires:	golang(github.com/docker/docker/pkg/mount)
+Requires:	golang(github.com/docker/docker/pkg/symlink)
+Requires:	golang(github.com/docker/docker/pkg/term)
+Requires:	golang(github.com/godbus/dbus)
+Requires:	golang(github.com/syndtr/gocapability/capability)
 Provides:       golang(%{import_path}) = %{version}-%{release}
 Provides:       golang(%{import_path}/apparmor) = %{version}-%{release}
 Provides:       golang(%{import_path}/cgroups) = %{version}-%{release}
@@ -73,7 +85,7 @@ This package contains library source intended for building other packages
 which use libcontainer.
 
 %prep
-%setup -n libcontainer-%{commit}
+%setup -q -n %{repo}-%{commit}
 rm -rf vendor
 
 %build
@@ -109,17 +121,13 @@ done
 %doc LICENSE MAINTAINERS MAINTAINERS_GUIDE.md NOTICE
 %doc PRINCIPLES.md README.md ROADMAP.md
 %dir %{gopath}/src/github.com/docker
-%dir %{gopath}/src/%{import_path}/
-%dir %{gopath}/src/%{import_path}/*
-%dir %{gopath}/src/%{import_path}/*/*
-%{gopath}/src/%{import_path}/*.go
-%{gopath}/src/%{import_path}/*/*.go
-%{gopath}/src/%{import_path}/*/MAINTAINERS
-%{gopath}/src/%{import_path}/*/*/*.go
-%{gopath}/src/%{import_path}/*/*/README.md
-%{gopath}/src/%{import_path}/*/*/*.c
+%{gopath}/src/%{import_path}
 
 %changelog
+* Tue Mar 31 2015 jchaloup <jchaloup@redhat.com> - 1.4.0-2.gitd7dea0e
+- Add [B]R to devel subpackage
+  related: #1164989
+
 * Mon Mar 09 2015 jchaloup <jchaloup@redhat.com> - 1.4.0-1.git83663f8
 - Bump to upstream 83663f82e3d76f57ea57faf80b8fd7eb96933b9b
   related: #1164989