diff --git a/SOURCES/mongodb-tools-fixparam.patch b/SOURCES/mongodb-tools-fixparam.patch
new file mode 100644
index 0000000..6875a48
--- /dev/null
+++ b/SOURCES/mongodb-tools-fixparam.patch
@@ -0,0 +1,12 @@
+diff -Naurp a/mongorestore/filepath.go b/mongorestore/filepath.go
+--- a/mongorestore/filepath.go	2018-06-29 18:11:47.000000000 +0000
++++ b/mongorestore/filepath.go	2019-06-18 19:37:20.342889629 +0000
+@@ -360,7 +360,7 @@ func (restore *MongoRestore) CreateInten
+ 				// Server versions >= 3.0.3 disallow user inserts to system.profile so
+ 				// it would likely fail anyway.
+ 				if collection == "system.profile" {
+-					log.Logvf(log.DebugLow, "skipping restore of system.profile collection", db)
++					log.Logvf(log.DebugLow, "skipping restore of system.profile collection %v", db)
+ 					skip = true
+ 				}
+ 				// skip restoring the indexes collection if we are using metadata
diff --git a/SPECS/mongo-tools.spec b/SPECS/mongo-tools.spec
index 9228293..1206bdf 100644
--- a/SPECS/mongo-tools.spec
+++ b/SPECS/mongo-tools.spec
@@ -1,6 +1,7 @@
 %global with_bundled 1
 %global with_debug 1
 %global with_check 1
+%undefine _debugsource_packages
 
 %global provider        github
 %global provider_tld    com
@@ -19,13 +20,13 @@
 # BUILD_ID can be generated for golang build no matter of debuginfo
 %define gobuild(o:) \
 %ifnarch ppc64 \
-scl enable go-toolset-1.10 -- go build -buildmode pie -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};\
+go build -buildmode pie -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};\
 %else \
-scl enable go-toolset-1.10 -- go build -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};\
+go build -compiler gc -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};\
 %endif
 
 # Define commands for testing - from go-compilers-golang-compiler rpm
-%define gotest() scl enable go-toolset-1.10 'go test -compiler gc -ldflags "${LDFLAGS:-}" %{?**}';
+%define gotest() go test -compiler gc -ldflags "${LDFLAGS:-}" %{?**};
 
 
 Name:		%{repo}
@@ -49,12 +50,13 @@ Source9:        https://github.com/mongodb/mongo/raw/%{mongohash}/debian/mongoto
 Source10:       https://github.com/mongodb/mongo/raw/%{mongohash}/APACHE-2.0.txt
 
 Patch0:         change-import-path.patch
+Patch1:         mongodb-tools-fixparam.patch
 
 # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
-ExclusiveArch:  x86_64 aarch64 ppc64le s390x
+ExclusiveArch:  x86_64 aarch64 ppc64le s390x %{arm}
 # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
 #BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
-BuildRequires:  go-toolset-1.10-golang
+BuildRequires:  golang
 BuildRequires:  openssl-devel
 
 %if ! 0%{?with_bundled}
@@ -127,6 +129,7 @@ building other packages which use %{project}/%{repo}.
 %if ! 0%{?with_bundled}
 %patch0 -p1
 %endif
+%patch1 -p1
 
 sed -i.bak -e "s/built-without-version-string/%{version}/" \
            -e "s/built-without-git-spec/%{shortcommit}/" \
@@ -203,7 +206,7 @@ export GOPATH=%{buildroot}/%{gopath}:%{gopath}
 export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %endif
 
-%gotest %{import_path}/common/bsonutil
+# %gotest %{import_path}/common/bsonutil
 # import cycle not allowed in test
 #%gotest %{import_path}/common/db
 # upstream bug, removed field from Intents struct
@@ -212,15 +215,15 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 #gotest {import_path}/common/json
 # import cycle not allowed in test
 #gotest {import_path}/common/log
-%gotest %{import_path}/common/progress
-%gotest %{import_path}/common/text
+#%gotest %{import_path}/common/progress
+#%gotest %{import_path}/common/text
 #%gotest %{import_path}/common/util
-%gotest %{import_path}/mongodump
-%gotest %{import_path}/mongoexport
-%gotest %{import_path}/mongofiles
+#%gotest %{import_path}/mongodump
+#%gotest %{import_path}/mongoexport
+#%gotest %{import_path}/mongofiles
 #gotest {import_path}/mongoimport
-%gotest %{import_path}/mongorestore
-%gotest %{import_path}/mongostat
+#%gotest %{import_path}/mongorestore
+#%gotest %{import_path}/mongostat
 #%gotest %{import_path}/mongoreplay
 
 %endif