diff --git a/golang.spec b/golang.spec
index 569fd9b..45e2c1e 100644
--- a/golang.spec
+++ b/golang.spec
@@ -111,7 +111,7 @@
 %global pkg_release 1
 
 # For rpmdev-bumpspec and releng automation.
-%global baserelease 1
+%global baserelease 2
  
 Name:           golang
 Version:        %{go_version}
@@ -349,6 +349,8 @@ cp %{SOURCE2} ./src/runtime/
     ./scripts/configure-crypto-tests.sh
     popd
 %endif
+# Remove all .orig files if they are generated during patching
+find -name "*.orig" -exec rm {} \;
 
 %build
 # -x: print commands as they are executed