diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch
index 34155f464b8cfc16014f6b7c6df6f33ab345680a..b19c218dc42c67e6603aeb619d854dc175fb9771 100644
--- a/console-setup-1.84-ctrll-lock.patch
+++ b/console-setup-1.84-ctrll-lock.patch
@@ -1,7 +1,7 @@
-diff -up console-setup-1.201/Keyboard/ckbcomp.orig console-setup-1.201/Keyboard/ckbcomp
---- console-setup-1.201/Keyboard/ckbcomp.orig	2021-03-10 09:35:05.639847205 +0100
-+++ console-setup-1.201/Keyboard/ckbcomp	2021-03-10 09:35:05.641847229 +0100
-@@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code (
+diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
+--- console-setup/Keyboard/ckbcomp.orig	2023-01-05 09:43:41.059205282 +0100
++++ console-setup/Keyboard/ckbcomp	2023-01-05 09:44:49.789082563 +0100
+@@ -204,10 +204,6 @@ my %acmtable; # Unicode -> legacy code (
  
  my $KEYMAP = ''; # This variable contains the generated keymap
  
@@ -12,17 +12,17 @@ diff -up console-setup-1.201/Keyboard/ckbcomp.orig console-setup-1.201/Keyboard/
  my %keycodes_table; # x keysym -> x key code
  my %aliases;        # x keysym -> x keysym
  
-@@ -4376,9 +4372,6 @@ sub print_vector {
+@@ -4400,9 +4396,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) {
+-		if ($v != $c && $v > 0x7f) {
 -		    $broken_caps = 1;
 -		}
  	    }
  	}
  	if ($no_NoSymbol) {
-@@ -4776,10 +4769,6 @@ keycode 127 =
+@@ -4800,10 +4793,6 @@ keycode 127 =
      die "$0: Unsupported keyboard type $arch\n";
  }
  
@@ -32,4 +32,4 @@ diff -up console-setup-1.201/Keyboard/ckbcomp.orig console-setup-1.201/Keyboard/
 -
  print $KEYMAP;
  
- if ($freebsd) {
+ if (!$compose_charmap && $charmap) {
diff --git a/console-setup.spec b/console-setup.spec
index 4624c21cc717ad82968ca39c278f7f6c994ed921..b326becf7e4ae0d988d0843eaadad8b587e78ad3 100644
--- a/console-setup.spec
+++ b/console-setup.spec
@@ -1,10 +1,10 @@
 Name:           console-setup
-Version:        1.207
+Version:        1.218
 Release:        1
 Summary:        Console font and keymap setup program
 License:        GPLv2+ and MIT and Public Domain
 URL:            https://packages.debian.org/cs/sid/console-setup
-Source0:        http://sourcearchive.raspbian.org/main/c/console-setup/console-setup_1.207.tar.xz
+Source0:        http://ftp.de.debian.org/debian/pool/main/c/%{name}/%{name}_%{version}.tar.xz
 Patch0:         console-setup-1.76-paths.patch
 Patch1:         console-setup-1.76-fsf-address.patch
 Patch2:         console-setup-1.84-ctrll-lock.patch
@@ -49,6 +49,9 @@ make prefix=%{buildroot} install-linux
 %{_mandir}/man*/*
 
 %changelog
+* Mon Apr 17 2023 yaoxin <yao_xin001@hoperun.com> - 1.218-1
+- Update to 1.218
+
 * Tue Jan 18 2022 SimpleUpdate Robot <tc@openeuler.org> - 1.207-1
 - Upgrade to version 1.207
 
diff --git a/console-setup_1.207.tar.xz b/console-setup_1.207.tar.xz
deleted file mode 100644
index 9d9e95e55b5fd5d345f3cb82952125710eccf576..0000000000000000000000000000000000000000
Binary files a/console-setup_1.207.tar.xz and /dev/null differ
diff --git a/console-setup_1.218.tar.xz b/console-setup_1.218.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..f75dfa24c877f023b9a127e68aa4fcf988291ea7
Binary files /dev/null and b/console-setup_1.218.tar.xz differ