diff --git a/.gitignore b/.gitignore
index 0ddcf64..e9db0b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /prjtrellis-03e0070.tar.gz
 /prjtrellis-db-fdf4bf2.tar.gz
 /prjtrellis-2f06397.tar.gz
+/prjtrellis-3ae21cf.tar.gz
diff --git a/sources b/sources
index 68c6aba..59bebe3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (prjtrellis-2f06397.tar.gz) = 94df7f4e70bfd0b3b33fcf83888011e5d2f039e537ee361fcaedc75450a7a0879f38f5352cb43dd0cc4f22c398d22765aa493b71e47f4bd5087e73fabf91170a
+SHA512 (prjtrellis-3ae21cf.tar.gz) = ca711a5a4ab4d9798d4bb780734a38f44361ff5bcfa709b8bd0b9ab4ac2b9d4f8ddc7839f193a29f9290a240b66c1546348cb886f03156fcd62af723b7a6c7ef
 SHA512 (prjtrellis-db-fdf4bf2.tar.gz) = 8129d883af99f8d4ddfe85b379606e716eb2cb71512e3832cd69039bb5262bf594da0971065142dcd29dfc3cc507a60a3b731776e219d078c24600746c550dd7
diff --git a/trellis.spec b/trellis.spec
index 1be6770..8c2750e 100644
--- a/trellis.spec
+++ b/trellis.spec
@@ -1,21 +1,21 @@
-%global commit0 2f06397673bbca3da11928d538b8ab7d01c944c6
+%global commit0 3ae21cf6a07f3883fafa5bf31e9104dfa6c9a63f
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 %global commit1 fdf4bf275a7402654bc643db537173e2fbc86103
 %global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
 
-%global snapdate 20220127
+%global snapdate 20220222
 
 %global __python %{__python3}
 
 Name:          trellis
-Version:       1.0
-Release:       0.23.%{snapdate}git%{shortcommit0}%{?dist}
+Version:       1.2.1
+Release:       1.%{snapdate}git%{shortcommit0}%{?dist}
 Summary:       Lattice ECP5 FPGA bitstream creation/analysis/programming tools
 License:       ISC
-URL:           https://github.com/SymbiFlow/prj%{name}
-Source0:       https://github.com/SymbiFlow/prj%{name}/archive/%{commit0}/prj%{name}-%{shortcommit0}.tar.gz
-Source1:       https://github.com/SymbiFlow/prj%{name}-db/archive/%{commit1}/prj%{name}-db-%{shortcommit1}.tar.gz
+URL:           https://github.com/YosysHQ/prj%{name}
+Source0:       https://github.com/YosysHQ/prj%{name}/archive/%{commit0}/prj%{name}-%{shortcommit0}.tar.gz
+Source1:       https://github.com/YosysHQ/prj%{name}-db/archive/%{commit1}/prj%{name}-db-%{shortcommit1}.tar.gz
 
 BuildRequires: make
 BuildRequires: cmake
@@ -114,6 +114,10 @@ install -Dpm644 -t %{buildroot}%{_mandir}/man1 man1/*
 %{_datadir}/%{name}/database
 
 %changelog
+* Mon Feb 21 2022 Gabriel Somlo <gsomlo@gmail.com> - 1.2.1-1.20220222git3ae21cf
+- Switch upstream to YosysHQ
+- Update to version 1.21
+
 * Thu Jan 27 2022 Gabriel Somlo <gsomlo@gmail.com> - 1.0-0.23.20220127git2f06397
 - Update to newer snapshot.