diff --git a/SOURCES/0001-autorelabel-call-dracut-initramfs-restore-before-for.patch b/SOURCES/0001-autorelabel-call-dracut-initramfs-restore-before-for.patch
new file mode 100644
index 0000000..978d9cf
--- /dev/null
+++ b/SOURCES/0001-autorelabel-call-dracut-initramfs-restore-before-for.patch
@@ -0,0 +1,25 @@
+From 46f5c65d242efafcc27c5da23d0f0d8387ba7250 Mon Sep 17 00:00:00 2001
+From: Michal Sekletar <msekleta@redhat.com>
+Date: Mon, 1 Feb 2016 17:00:43 +0100
+Subject: [PATCH] autorelabel: call dracut-initramfs-restore before forced
+ reboot
+
+---
+ systemd/rhel-autorelabel | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/systemd/rhel-autorelabel b/systemd/rhel-autorelabel
+index 7cb9b40..924df8e 100755
+--- a/systemd/rhel-autorelabel
++++ b/systemd/rhel-autorelabel
+@@ -31,6 +31,7 @@ relabel_selinux() {
+ /sbin/fixfiles $FORCE restore > /dev/null 2>&1
+ fi
+ rm -f /.autorelabel
++ /usr/lib/dracut/dracut-initramfs-restore
+ systemctl --force reboot
+ }
+
+--
+2.4.3
+
diff --git a/SOURCES/0001-autorelabel-turn-quota-off-before-relabeling.patch b/SOURCES/0001-autorelabel-turn-quota-off-before-relabeling.patch
new file mode 100644
index 0000000..ae599f3
--- /dev/null
+++ b/SOURCES/0001-autorelabel-turn-quota-off-before-relabeling.patch
@@ -0,0 +1,24 @@
+From b399247905d9d4a9d12bb3f17b6d085dfbd674c8 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn@redhat.com>
+Date: Mon, 14 Mar 2016 20:24:31 +0100
+Subject: [PATCH] autorelabel: turn quota off before relabeling
+
+---
+ systemd/rhel-autorelabel | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/systemd/rhel-autorelabel b/systemd/rhel-autorelabel
+index 924df8e..d87acd2 100755
+--- a/systemd/rhel-autorelabel
++++ b/systemd/rhel-autorelabel
+@@ -28,6 +28,7 @@ relabel_selinux() {
+ echo $"*** system size and speed of hard drives."
+
+ FORCE=`cat /.autorelabel`
++ [ -x "/usr/sbin/quotaoff" ] && /usr/sbin/quotaoff -aug
+ /sbin/fixfiles $FORCE restore > /dev/null 2>&1
+ fi
+ rm -f /.autorelabel
+--
+2.4.3
+
diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index b6a0d5f..3be539b 100644
--- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.30
# ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+
Group: System Environment/Base
-Release: 1%{?dist}
+Release: 1%{?dist}.2
URL: http://fedorahosted.org/releases/i/n/initscripts/
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -35,6 +35,9 @@ Requires(preun): /sbin/chkconfig
BuildRequires: glib2-devel popt-devel gettext pkgconfig
Provides: /sbin/service
+Patch1: 0001-autorelabel-call-dracut-initramfs-restore-before-for.patch
+Patch2: 0001-autorelabel-turn-quota-off-before-relabeling.patch
+
%description
The initscripts package contains basic system scripts used
during a boot of the system. It also contains scripts which
@@ -53,6 +56,8 @@ Currently, this consists of various memory checking code.
%prep
%setup -q
+%patch1 -p1
+%patch2 -p1
%build
make
@@ -216,6 +221,12 @@ rm -rf $RPM_BUILD_ROOT
/etc/profile.d/debug*
%changelog
+* Tue Mar 15 2016 Lukáš Nykrýn <lnykryn@redhat.com> - 9.49.30-2.1
+- autorelabel: turn quota off before relabeling
+
+* Tue Feb 02 2016 Lukáš Nykrýn <lnykryn@redhat.com> - 9.49.30-1.1
+- autorelabel: call dracut-initramfs-restore before forced reboot
+
* Wed Sep 16 2015 Lukáš Nykrýn <lnykryn@redhat.com> - 9.49.30-1
- ifup-eth: some bridge options are applied later