diff --git a/SOURCES/uuid_xfs.patch b/SOURCES/uuid_xfs.patch
new file mode 100644
index 0000000..67d6cb5
--- /dev/null
+++ b/SOURCES/uuid_xfs.patch
@@ -0,0 +1,41 @@
+From 64a685e1a464450c7d2679b59a913969012a2177 Mon Sep 17 00:00:00 2001
+From: jmazanek <jmazanek@redhat.com>
+Date: Fri, 9 Dec 2016 09:52:00 +0100
+Subject: [PATCH] Correcting UUID creation on xfs filesystem
+
+---
+ .../layout/prepare/GNU/Linux/13_include_filesystem_code.sh | 14 ++++++++++----
+ 1 file changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/usr/share/rear/layout/prepare/GNU/Linux/13_include_filesystem_code.sh b/usr/share/rear/layout/prepare/GNU/Linux/13_include_filesystem_code.sh
+index 71aed00..7b3e82c 100644
+--- a/usr/share/rear/layout/prepare/GNU/Linux/13_include_filesystem_code.sh
++++ b/usr/share/rear/layout/prepare/GNU/Linux/13_include_filesystem_code.sh
+@@ -79,14 +79,20 @@ EOF
+         (xfs)
+ cat >> "$LAYOUT_CODE" <<EOF
+ LogPrint "Creating $fstype-filesystem $mp on $device"
+-mkfs.xfs -f $device
+ EOF
++            if [ -n "$uuid" ]; then
++               ( echo "if ! mkfs.xfs -f -m uuid=$uuid $device >&2; then"
++                 echo "    mkfs.xfs -f $device >&2"
++                 echo "    xfs_admin -U $uuid $device >&2"
++                 echo "fi"
++               ) >> "$LAYOUT_CODE"
++            else
++                # Actually create the filesystem
++                echo "mkfs.xfs -f $device >&2" >> "$LAYOUT_CODE"
++            fi
+             if [ -n "$label" ] ; then
+                 echo "xfs_admin -L $label $device >&2" >> "$LAYOUT_CODE"
+             fi
+-            if [ -n "$uuid" ] ; then
+-                echo "xfs_admin -U $uuid $device >&2" >> "$LAYOUT_CODE"
+-            fi
+             ;;
+         (reiserfs)
+ cat >> "$LAYOUT_CODE" <<EOF
+-- 
+1.8.3.1
+
diff --git a/SPECS/rear.spec b/SPECS/rear.spec
index 15c1b8c..8bba5db 100644
--- a/SPECS/rear.spec
+++ b/SPECS/rear.spec
@@ -2,7 +2,7 @@
 Summary:    Relax-and-Recover is a Linux disaster recovery and system migration tool
 Name:       rear
 Version:    1.17.2
-Release:    6%{?dist}
+Release:    7%{?dist}
 License:    GPLv3
 Group:      Applications/File
 URL:        http://relax-and-recover.org/
@@ -12,6 +12,7 @@ Source0:    https://sourceforge.net/projects/rear/files/rear/1.17/%{version}/rea
 Source1:    36_teaming.sh
 Patch0:     rear-grep-fix.patch
 Patch1:     rear-teaming-interface.patch
+Patch2:     uuid_xfs.patch
 BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 ### Dependencies on all distributions
@@ -95,6 +96,7 @@ fi
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 echo "30 1 * * * root /usr/sbin/rear checklayout || /usr/sbin/rear mkrescue" >rear.cron
 
@@ -125,6 +127,10 @@ cp %{SOURCE1} %{buildroot}%{_datadir}/rear/rescue/GNU/Linux/36_teaming.sh
 %{_sbindir}/rear
 
 %changelog
+* Tue Dec 13 2016 Jakub Mazanek <jmazanek@redhat.com> - 1.17.2-7
+- Correcting UUID creation on xfs filesystem
+Resolves: #1404167
+
 * Tue Jul 19 2016 Petr Hracek <phracek@redhat.com> - 1.17.2-6
 - Replace experimental grep -P with grep -E
 Resolves: #1290205