diff --git a/syncthing-0.11.20.tar.gz b/syncthing-0.11.20.tar.gz
deleted file mode 100644
index c0115fa..0000000
--- a/syncthing-0.11.20.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:89416e33f27434ee95c4e4c47e13a2211a4246c87728e52298e713050a62dac8
-size 4173247
diff --git a/syncthing-0.11.21.tar.gz b/syncthing-0.11.21.tar.gz
new file mode 100644
index 0000000..0465a9d
--- /dev/null
+++ b/syncthing-0.11.21.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d500857b9e165c0b574a86ca31bb067c4a8540c4c7591b6557dcc37189aeedd1
+size 4174227
diff --git a/syncthing.changes b/syncthing.changes
index e6cdb95..564954c 100644
--- a/syncthing.changes
+++ b/syncthing.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Aug 23 16:03:43 UTC 2015 - sor.alexei@meowr.ru
+
+- Update to 0.11.21:
+  * Recover from 'corrupted or incomplete CURRENT file' etc.
+  * Retain standard streams over restart.
+  * Add unit test for staggered versioning.
+  * Newest first should be different from oldest first.
+  * Fix time zone error in staggered versioning.
+
 -------------------------------------------------------------------
 Mon Aug 17 09:23:21 UTC 2015 - sor.alexei@meowr.ru
 
diff --git a/syncthing.spec b/syncthing.spec
index edc09be..8ebedb4 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -17,7 +17,7 @@
 
 
 Name:           syncthing
-Version:        0.11.20
+Version:        0.11.21
 Release:        0
 Summary:        FOSS Continuous File Synchronization
 License:        MPL-2.0
@@ -28,7 +28,7 @@ Source1:        %{name}.firewall
 BuildRequires:  go >= 1.3
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
-%go_exclusivearch
+%go_provides
 
 %description
 Syncthing replaces proprietary sync and cloud services with
@@ -48,10 +48,10 @@ sed -i '/^RestartForceExitStatus=/d;s/^\(SuccessExitStatus=\).*$/\12/' \
 %build
 echo "v%{version}" | tee RELEASE
 %goprep github.com/%{name}/%{name}
-go run build.go -no-upgrade build
+go run build.go $BUILDFLAGS -no-upgrade
 
 %install
-install -Dm 0755 %{name} %{buildroot}%{_bindir}/%{name}
+install -Dm 0755 bin/%{name} %{buildroot}%{_bindir}/%{name}
 install -Dm 0644 etc/linux-systemd/system/%{name}@.service \
   %{buildroot}%{_unitdir}/%{name}@.service
 install -Dm 0644 etc/linux-systemd/user/%{name}.service    \