diff --git a/.gitignore b/.gitignore
index 770b66c..9c59b1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /cockpit-machines-261.tar.xz
 /cockpit-machines-262.tar.xz
 /cockpit-machines-263.tar.xz
+/cockpit-machines-264.tar.xz
diff --git a/cockpit-machines.spec b/cockpit-machines.spec
index b9e225c..6a29d17 100644
--- a/cockpit-machines.spec
+++ b/cockpit-machines.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        263
+Version:        264
 Release: 1%{?dist}
 #
 # Copyright (C) 2021 Red Hat, Inc.
@@ -27,6 +27,10 @@ Source0:        https://github.com/cockpit-project/%{name}/releases/download/%{v
 BuildArch:      noarch
 BuildRequires:  libappstream-glib
 BuildRequires:  make
+BuildRequires: gettext
+%if 0%{?rhel} && 0%{?rhel} <= 8
+BuildRequires: libappstream-glib-devel
+%endif
 
 Requires: cockpit-bridge >= 215
 %if 0%{?suse_version}
@@ -65,6 +69,10 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Mar 16 2022 Simon Kobyda <skobyda@redhat.com> - 264-1
+- Disk serial number
+- Multiple fixes of host device attachement
+
 * Wed Mar 02 2022 Martin Pitt <martin@piware.de> - 263-1
 - Delete storage files also when the VM is shut off
 - Translation updates (rhbz#2017343)
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index a83075c..7235a4e 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,6 +2,6 @@ discover:
   how: fmf
   repository: https://github.com/cockpit-project/cockpit-machines
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "263"
+  ref: "264"
 execute:
   how: tmt
diff --git a/sources b/sources
index ef8fed8..80a5a38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-machines-263.tar.xz) = ba51d09f77d2493caf8f1e6c2a2bccb14afc077a9e5244cbf757d688c63b62048a28f36bcd038050a7dfc69740fbc41a1c7b9fc9885618a1f4663628b27bb4c3
+SHA512 (cockpit-machines-264.tar.xz) = 46a5a9ae4568ee2a9acc89b0b5b4e9946e3bdd3e74dc12c4ed29bc92b567703053afe373035feaa47f1c05e44ff1f6265a75e4a1b1ec120838a31ae09cf6e22f