diff --git a/SOURCES/tuned-2.7.1-non-existent-profile-timeout-fix.patch b/SOURCES/tuned-2.7.1-non-existent-profile-timeout-fix.patch
new file mode 100644
index 0000000..b8f547b
--- /dev/null
+++ b/SOURCES/tuned-2.7.1-non-existent-profile-timeout-fix.patch
@@ -0,0 +1,29 @@
+From 8121ea9166d5f2828d97338811c5521c7a30489f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Tue, 23 Aug 2016 16:55:29 +0200
+Subject: tuned-adm: do not timeout if non-existent profile is requested
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+---
+ tuned/admin/admin.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tuned/admin/admin.py b/tuned/admin/admin.py
+index ddf6d9e..0c4caa5 100644
+--- a/tuned/admin/admin.py
++++ b/tuned/admin/admin.py
+@@ -186,7 +186,7 @@ class Admin(object):
+ 			return False
+ 		self._daemon_action_finished.clear()
+ 		(ret, msg) = self._controller.switch_profile(profile_name)
+-		if self._async:
++		if self._async or not ret:
+ 			return self._controller.exit(self._profile_print_status(ret, msg))
+ 		else:
+ 			self._timestamp = time.time()
+-- 
+cgit v0.12
+
diff --git a/SPECS/tuned.spec b/SPECS/tuned.spec
index 8858164..bc46e20 100644
--- a/SPECS/tuned.spec
+++ b/SPECS/tuned.spec
@@ -1,7 +1,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 2.7.1
-Release: 3%{?dist}
+Release: 3%{?dist}.1
 License: GPLv2+
 Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2
 URL: https://fedorahosted.org/tuned/
@@ -17,6 +17,7 @@ Requires: util-linux, python-perf, dbus, polkit
 Patch0: tuned-2.7.1-gtk-3.8.patch
 Patch1: tuned-2.7.1-gui-daemon-restart-fix.patch
 Patch2: tuned-2.7.1-fixed-traceback.patch
+Patch3: tuned-2.7.1-non-existent-profile-timeout-fix.patch
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -120,6 +121,7 @@ It can be also used to fine tune your system for specific scenarios.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 
@@ -328,6 +330,10 @@ fi
 %{_mandir}/man7/tuned-profiles-compat.7*
 
 %changelog
+* Tue Nov  8 2016 Jaroslav Škarvada <jskarvad@redhat.com> - 2.7.1-3.1
+- Fixed timeout if non-existent profile is requested
+  resolves: rhbz#1392942
+
 * Mon Sep 12 2016 Ondřej Lysoněk <olysonek@redhat.com> - 2.7.1-3
 - Fixed a traceback
   resolves: rhbz#1372298