diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch
new file mode 100644
index 0000000..147e2a5
--- /dev/null
+++ b/console-setup-1.84-ctrll-lock.patch
@@ -0,0 +1,35 @@
+diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
+--- console-setup/Keyboard/ckbcomp.orig	2018-06-21 10:58:36.262160943 +0200
++++ console-setup/Keyboard/ckbcomp	2018-06-27 13:04:01.843639711 +0200
+@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code (
+ 
+ my $KEYMAP = ''; # This variable contains the generated keymap
+ 
+-my $broken_caps = 0; # In unicode mode Caps_Lock doesn't work for non-ASCII
+-                     # letters.  1 = the keymap contains non-ascii letters.
+-                     # See http://bugzilla.kernel.org/show_bug.cgi?id=7746#c21
+-
+ my %keycodes_table; # x keysym -> x key code
+ my %aliases;        # x keysym -> x keysym
+ 
+@@ -4376,9 +4372,6 @@ sub print_vector {
+ 		my $u = ord (uc (pack ("U", $v)));
+ 		my $c = ($v == $l ? $u : $l);
+ 		$capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c);
+-		if ($v != $c && $v gt 0x7f) {
+-		    $broken_caps = 1;
+-		}
+ 	    }
+ 	}
+ 	if ($no_NoSymbol) {
+@@ -4776,10 +4769,6 @@ keycode 127 =
+     die "$0: Unsupported keyboard type $arch\n";
+ }
+ 
+-if ($broken_caps) {
+-    $KEYMAP =~ s/Caps_Lock/CtrlL_Lock/g;
+-}
+-
+ print $KEYMAP;
+ 
+ if ($freebsd) {
diff --git a/console-setup.spec b/console-setup.spec
index 181dcf3..2e0ddb5 100644
--- a/console-setup.spec
+++ b/console-setup.spec
@@ -1,7 +1,7 @@
 
 Name:		console-setup
 Version:	1.184
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Tools for configuring the console using X Window System key maps
 
 # For a breakdown of the licensing, see COPYRIGHT, copyright, copyright.fonts and copyright.xkb
@@ -13,6 +13,8 @@ Source0:	http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.
 Patch0:		console-setup-1.76-paths.patch
 # Fixes FSF address, sent to upstream
 Patch1:		console-setup-1.76-fsf-address.patch
+# Removes Caps_Lock to CtrlL_Lock substitution
+Patch2:		console-setup-1.84-ctrll-lock.patch
 
 Requires:	kbd
 # require 'xkeyboard-config' to have X Window keyboard descriptions?
@@ -33,6 +35,7 @@ supports several languages that would be otherwise unsupported on the console
 %setup -q -n %{name}
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .fsf-address
+%patch2 -p1 -b .ctrll-lock
 
 
 %build
@@ -60,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT/etc/console-setup
 
 
 %changelog
+* Thu Jun 28 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.184-2
+- Remove Caps Lock to CtrlL_Lock substitution
+  Resolves: #1586149
+
 * Thu Apr 19 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.184-1
 - Update to latest upstream version
   Resolves: #1562605