diff --git a/go.changes b/go.changes
index 796dab5..b03e8a3 100644
--- a/go.changes
+++ b/go.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Mar 19 09:58:09 UTC 2015 - i@marguerite.su
+
+- remove redefinition of os_install_post macro, which was used to
+  override brp-strip-static-archive that has been manually removed
+  from openSUSE distribution since 2011.05. 
+- This might fix i586 builds for openSUSE:Factory:
+  * Too many levels of recursion in macro expansion
+  * Failed to write file: invalid section alignment
+
 -------------------------------------------------------------------
 Sat Mar  7 15:24:29 UTC 2015 - i@marguerite.su
 
diff --git a/go.spec b/go.spec
index b41c8e0..fb20469 100644
--- a/go.spec
+++ b/go.spec
@@ -71,8 +71,8 @@ Provides:       go-devel = %{name}%{version}
 Provides:       go-devel-static = %{name}%{version}
 Obsoletes:      go-devel < %{name}%{version}
 # go-vim/emacs were separate projects starting from 1.4
-Obsoletes:		go-vim <= 1.3.3
-Obsoletes:		go-emacs <= 1.3.3
+Obsoletes:      go-emacs <= 1.3.3
+Obsoletes:      go-vim <= 1.3.3
 ExclusiveArch:  %ix86 x86_64 %arm
 
 %description
@@ -184,9 +184,6 @@ rm %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}/{textflag,funcdata,cgocall,run
 ln -s %{_datadir}/go/src/cmd/ld/textflag.h %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}
 ln -s %{_datadir}/go/src/runtime/{runtime,cgocall,funcdata}.h %{buildroot}%{_libdir}/go/pkg/linux_%{go_arch}
 
-# Disable brp-strip-static-archive breaks build
-%define __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib/rpm/[^/]*/?brp-strip-static-archive %{__strip}!!g')
-
 %if 0%{?suse_version} >= 1100
 %fdupes %{buildroot}%{_prefix}
 %endif