diff --git a/.gitignore b/.gitignore
index fa28c21..f47e50f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-/check-91ae5f88a67b14891cfd43895b01164f6c120420.tar.gz
+/check-10bfe05.tar.gz
+/check-91ae5f8.tar.gz
diff --git a/golang-gopkg-check.spec b/golang-gopkg-check.spec
index 9644780..cbd3910 100644
--- a/golang-gopkg-check.spec
+++ b/golang-gopkg-check.spec
@@ -9,16 +9,26 @@
 %global import_path     %{provider}.%{provider_tld}/%{repo}.%{version}
 %global import_path_sec launchpad.net/gocheck
 
+# github.com/motain/gocheck, cloned from github.com/go-check/check on Oct 23, 2013
+%global mcommit         10bfe0586b48cbca10fe6c43d6e18136f25f8c0c
+%global mscommit        %(c=%{mcommit}; echo ${c:0:7})
+%global mimport_path    github.com/motain/gocheck
+
 Name:           golang-gopkg-%{repo}
 Version:        0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Rich testing for the Go language
 License:        BSD
 # gopkg.in/check.v1
 URL:            http://%{import_path}
-Source0:        https://github.com/go-%{repo}/%{repo}/archive/%{commit}/%{repo}-%{commit}.tar.gz
+Source0:	https://github.com/go-%{repo}/%{repo}/archive/%{mcommit}/%{repo}-%{mscommit}.tar.gz
+Source1:        https://github.com/go-%{repo}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 Obsoletes:	golang-launchpad-gocheck
-ExclusiveArch:	%{ix86} x86_64 %{arm}
+%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7
+BuildArch:      noarch
+%else
+ExclusiveArch:  %{ix86} x86_64 %{arm}
+%endif
 
 %description
 %{summary}
@@ -38,7 +48,8 @@ This package contains library source intended for
 building other packages which use %{import_path}.
 
 %prep
-%setup -n %{repo}-%{commit} -q
+%setup -n %{repo}-%{mcommit} -q
+%setup -n %{repo}-%{commit} -q -T -b 1
 
 %build
 
@@ -47,6 +58,9 @@ install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
 cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path}/
 install -d -p %{buildroot}/%{gopath}/src/%{import_path_sec}/
 cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
+pushd ../%{repo}-%{mcommit}
+install -d -p %{buildroot}/%{gopath}/src/%{mimport_path}/
+cp -pav *.go %{buildroot}/%{gopath}/src/%{mimport_path}/
 
 %check
 #GOPATH={buildroot}{gopath}:{gopath} go test {import_path}
@@ -54,14 +68,17 @@ cp -pav *.go %{buildroot}/%{gopath}/src/%{import_path_sec}/
 %files devel
 %doc LICENSE README.md
 # once src/gopkg.in gets into golang package, remove the line bellow
-%dir %{gopath}/src/gopkg.in
-%dir %{gopath}/src/%{import_path}
-%{gopath}/src/%{import_path}/*.go
+%{gopath}/src/%{import_path}
 %dir %{gopath}/src/launchpad.net
-%dir %{gopath}/src/%{import_path_sec}
-%{gopath}/src/%{import_path_sec}/*.go
+%{gopath}/src/%{import_path_sec}
+%dir %{gopath}/src/github.com/motain
+%{gopath}/src/github.com/motain/gocheck
 
 %changelog
+* Tue Jan 13 2015 jchaloup <jchaloup@redhat.com> - 0-3
+- Add github.com/motain/gocheck into devel subpackage
+  related: #1151779
+
 * Tue Dec 09 2014 jchaloup <jchaloup@redhat.com> - 0-2
 - Obsolete golang-launchpad-gocheck-devel with devel subpackage
   related: #1151779
diff --git a/sources b/sources
index 4e8dcab..cb4a7d1 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-8bfe6cb62d12d0f05e602a06681917d7  check-91ae5f88a67b14891cfd43895b01164f6c120420.tar.gz
+d264f8337bb29da228b024a217704820  check-10bfe05.tar.gz
+8bfe6cb62d12d0f05e602a06681917d7  check-91ae5f8.tar.gz