diff --git a/.files b/.files
index 607d1d8..3bf2818 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index afe4ddb..2238497 100644
--- a/.rev
+++ b/.rev
@@ -15,4 +15,13 @@
     <comment></comment>
     <requestid>854273</requestid>
   </revision>
+  <revision rev="3" vrev="1">
+    <srcmd5>42285ae35a85e97e38761a04fddf3484</srcmd5>
+    <version>2.2.1+git.1617669398.babea82e</version>
+    <time>1622759595</time>
+    <user>dimstar_suse</user>
+    <comment>- Update to upstream version 2.2.1
+- Split Loki server and Promtail client into separate packages</comment>
+    <requestid>897231</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
index f4041ef..74170dd 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1 +1 @@
-282c1949703925df9b04553663cb2eab
+a15c19a2ed26900642fd9d5ec678cef8
diff --git a/_service b/_service
index 1876560..81b1e8b 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,7 @@
     <param name="exclude">.git</param>
     <param name="filename">loki</param>
     <param name="versionformat">@PARENT_TAG@+git.%ct.%h</param>
-    <param name="revision">v2.0.0</param>
+    <param name="revision">v2.2.1</param>
     <param name="versionrewrite-pattern">v(.*)</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/loki-2.0.0+git.1603727260.6978ee5d.tar.bz2 b/loki-2.0.0+git.1603727260.6978ee5d.tar.bz2
deleted file mode 120000
index 1062460..0000000
--- a/loki-2.0.0+git.1603727260.6978ee5d.tar.bz2
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeib7fq3zkr4onyxd3ytayjttamzivymefvecnemwh2a4fuc6nwrs7i
\ No newline at end of file
diff --git a/loki-2.2.1+git.1617669398.babea82e.tar.bz2 b/loki-2.2.1+git.1617669398.babea82e.tar.bz2
new file mode 120000
index 0000000..30307e7
--- /dev/null
+++ b/loki-2.2.1+git.1617669398.babea82e.tar.bz2
@@ -0,0 +1 @@
+/ipfs/bafybeihk2bialjsdfj2axhvgpwkxbr7qa36jy3aej3q2lltm334j5ijuva
\ No newline at end of file
diff --git a/loki.changes b/loki.changes
index 3d4c2ee..c792552 100644
--- a/loki.changes
+++ b/loki.changes
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Fri May 28 07:51:35 UTC 2021 - Stefano Torresi <stefano.torresi@suse.com>
+
+- Update to upstream version 2.2.1
+
+-------------------------------------------------------------------
+Tue May 18 07:43:11 UTC 2021 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Split Loki server and Promtail client into separate packages
+
+-------------------------------------------------------------------
 Tue Dec  8 23:05:04 UTC 2020 - Bogdano Arendartchuk <BArendartchuk@suse.com>
 
 - .service: Fix CONFIG_FILE to expand mid-word
diff --git a/loki.spec b/loki.spec
index 6ab68d2..47b1935 100644
--- a/loki.spec
+++ b/loki.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package loki
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           loki
-Version:        2.0.0+git.1603727260.6978ee5d
+Version:        2.2.1+git.1617669398.babea82e
 Release:        0
 Summary:        Loki: like Prometheus, but for logs.
 License:        Apache-2.0
@@ -31,7 +31,7 @@ Source4:        sysconfig.promtail
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  golang-packaging
 BuildRequires:  systemd-devel
-BuildRequires:  golang(API) >= 1.13
+BuildRequires:  golang(API) >= 1.15
 Requires:       group(loki)
 Requires:       user(loki)
 Requires(post): %fillup_prereq
@@ -42,6 +42,19 @@ Requires(post): %fillup_prereq
 %description
 Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus.
 
+This package contains the Loki server
+
+%package -n promtail
+Summary:        Promtail Client
+Group:          System/Monitoring
+Requires:       group(loki)
+Requires:       user(loki)
+
+%description -n promtail
+Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus.
+
+This package contains the Promtail client.
+
 %prep
 %setup -q %{name}-%{version}
 
@@ -83,34 +96,47 @@ install -Dm755 promtail %{buildroot}%{_bindir}
 install -Dm755 logcli %{buildroot}%{_bindir}
 
 %pre
-%service_add_pre loki.service promtail.service
+%service_add_pre loki.service
 
 %post
-%fillup_only -n loki
-%fillup_only -n promtail
-%service_add_post loki.service promtail.service
+%fillup_only -n loki-server
+%service_add_post loki.service
 
 %preun
-%service_del_preun loki.service promtail.service
+%service_del_preun loki.service
 
 %postun
 %service_del_postun loki.service promtail.service
 
+%pre -n promtail
+%service_add_pre promtail.service
+
+%post -n promtail
+%fillup_only -n promtail
+%service_add_post promtail.service
+
+%preun -n promtail
+%service_del_preun promtail.service
+
+%postun -n promtail
+%service_del_postun promtail.service
+
 %files
-%defattr(-,root,root)
 %license LICENSE
 %doc README.md
 %{_unitdir}/loki.service
-%{_unitdir}/promtail.service
 %{_fillupdir}/sysconfig.loki
-%{_fillupdir}/sysconfig.promtail
 %{_bindir}/loki
-%{_bindir}/promtail
 %{_bindir}/logcli
 %dir %{_sysconfdir}/loki
 %config(noreplace) %{_sysconfdir}/loki/loki.yaml
-%config(noreplace) %{_sysconfdir}/loki/promtail.yaml
 %{_sbindir}/rcloki
+
+%files -n promtail
+%{_unitdir}/promtail.service
+%{_fillupdir}/sysconfig.promtail
+%{_bindir}/promtail
+%config(noreplace) %{_sysconfdir}/loki/promtail.yaml
 %{_sbindir}/rcpromtail
 
 %changelog