diff --git a/.gitignore b/.gitignore
index ec9b30d..4b4b9d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /synapse-v0.19.3.tar.gz
+/synapse-0.21.1.tar.gz
diff --git a/matrix-synapse.spec b/matrix-synapse.spec
index 3220d59..cf0ce17 100644
--- a/matrix-synapse.spec
+++ b/matrix-synapse.spec
@@ -1,12 +1,12 @@
 %global srcname synapse
 
 Name:       matrix-%{srcname}
-Version:    0.19.3
-Release:    4%{?dist}
+Version:    0.21.1
+Release:    1%{?dist}
 Summary:    A Matrix reference homeserver written in Python using Twisted
 License:    ASL 2.0
 URL:        https://github.com/matrix-org/%{srcname}
-Source0:    %{url}/archive/v%{version}/%{srcname}-v%{version}.tar.gz
+Source0:    %{url}/archive/v%{version}/%{srcname}-%{version}.tar.gz
 Source1:    synapse.sysconfig
 # Upstream pins its version of pynacl:
 # https://github.com/matrix-org/synapse/issues/1642
@@ -29,6 +29,7 @@ BuildRequires:  python-lxml
 BuildRequires:  python-matrix-synapse-ldap3 >= 0.1
 BuildRequires:  python-msgpack
 BuildRequires:  python-netaddr >= 0.7.18
+BuildRequires:  python2-phonenumbers
 BuildRequires:  python-pillow
 BuildRequires:  python-psutil >= 2.0.0
 BuildRequires:  python-pyasn1
@@ -59,6 +60,7 @@ Requires:       python-lxml
 Requires:       python-matrix-synapse-ldap3 >= 0.1
 Requires:       python-msgpack
 Requires:       python-netaddr >= 0.7.18
+Requires:       python2-phonenumbers
 Requires:       python-pillow
 Requires:       python-psutil >= 2.0.0
 Requires:       python-pyasn1
@@ -87,7 +89,7 @@ the ecosystem.
 
 
 %prep
-%autosetup -p1 -n %{srcname}-%{version}
+%autosetup -p1
 
 # We don't support the built-in client so remove all the bundled JS.
 rm -rf synapse/static
@@ -141,6 +143,9 @@ exit 0
 
 
 %changelog
+* Fri Jun 23 2017 Jeremy Cline <jeremy@jcline.org> - 0.21.1-1
+- Update to latest upstream release
+
 * Tue May 30 2017 Jeremy Cline <jeremy@jcline.org> - 0.19.3-4
 - use _sharedstatedir  rather than _localstatedir
 
diff --git a/sources b/sources
index a8becd9..dff1348 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (synapse-v0.19.3.tar.gz) = ebfcac4cc5f0d0f6e54d294cc91bb3c948e94feaa0877d08dfa5d3aab7abbbf181f47426fa0e3530ae31a3df1c6d344f7df00bceb8afb80e75032ea91b17d0b0
+SHA512 (synapse-0.21.1.tar.gz) = b8787ac9569fb725865d3cac32f894718abae66189911112289924851a4d9d4055c39fb8248502027ece0133f604b5a37383c69167bbdf5ba1aea9182a329d37