diff --git a/.gitignore b/.gitignore
index 139ff6a..dbfecec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /cockpit-machines-243.1.tar.gz
 /cockpit-machines-244.1.tar.gz
 /cockpit-machines-247.tar.gz
+/cockpit-machines-248.tar.gz
diff --git a/cockpit-machines.spec b/cockpit-machines.spec
index 44205d2..aa7fd94 100644
--- a/cockpit-machines.spec
+++ b/cockpit-machines.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        247
+Version:        248
 Release: 1%{?dist}
 #
 # Copyright (C) 2021 Red Hat, Inc.
@@ -17,6 +17,7 @@ Release: 1%{?dist}
 # You should have received a copy of the GNU Lesser General Public License
 # along with Cockpit; If not, see <http://www.gnu.org/licenses/>.
 #
+
 Name:           cockpit-machines
 Summary:        Cockpit user interface for virtual machines
 License:        LGPLv2+ and MIT
@@ -63,6 +64,11 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*
 
 # The changelog is automatically generated and merged
 %changelog
+* Thu Jul 22 2021 Matej Marusak <mmarusak@redhat.com> - 248 - 1
+- Machines: Don't round or floor memory and storage size unnecessarily (rhbz#1979152)
+- Machines: Use cockpit's proxy API for monitoring libvirt service changes (rhbz#1974223)
+- Machines: Fix ooops when press the down arrow several times when inputting custom path (rhbz#1977554)
+
 * Thu July 09 2021 Katerina Koukiou <kkoukiou@redhat.com> - 247-1
 
 - Machines: Share host files with the guest using virtiofs
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index 19d5a42..8cf2e85 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: "11ecadd6553c3bbee03a6aa71fb2acf0042f0e1a"
+  ref: "248"
 execute:
   how: tmt
diff --git a/sources b/sources
index f0f96d9..17ae695 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-machines-247.tar.gz) = d0e2b18de39d8ab44937c2e76343eb6dbaa92d7ba9766fd5974f4a3a0903dec80da44425525d671bb94ebbe7ae20e18d24ca5e3044f0fbadbd555ad1593fa991
+SHA512 (cockpit-machines-248.tar.gz) = 09805999337fe8e603ffab236b0e82b988dad6a371841f767d7d0a98bd797ca4489d8a71ec54bb327f68c27053fb8f35b9fb57132ee686ea1ba53755e643e545