diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 0864faec..a190003b 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -247,6 +247,7 @@ rdp_keymaps =                   \
     keymaps/de_de_qwertz.keymap \
     keymaps/en_us_qwerty.keymap \
     keymaps/fr_fr_azerty.keymap \
+    keymaps/fr_ch_qwertz.keymap \
     keymaps/it_it_qwerty.keymap \
     keymaps/ja_jp_qwerty.keymap \
     keymaps/sv_se_qwerty.keymap
diff --git a/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
new file mode 100644
index 00000000..52cc18ae
--- /dev/null
+++ b/src/protocols/rdp/keymaps/fr_ch_qwertz.keymap
@@ -0,0 +1,57 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+parent  "base"
+name    "fr-ch-qwertz"
+freerdp "KBD_SWISS_FRENCH"
+
+#
+# Basic keys
+#
+
+map -altgr -shift 0x29 0x02..0x0C           ~ "§1234567890'"
+map -altgr -shift      0x10..0x19 0x1A      ~ "qwertzuiopè"
+map -altgr -shift      0x1E..0x28 0x2B      ~ "asdfghjkléà$"
+map -altgr -shift 0x56 0x2C..0x35           ~ "<yxcvbnm,.-"
+
+map -altgr +shift 0x29 0x02..0x0C           ~ "°+"*ç%&/()=?"
+map -altgr +shift      0x10..0x19 0x1A 0x1B ~ "QWERTZUIOPü!"
+map -altgr +shift      0x1E..0x28 0x2B      ~ "ASDFGHJKLöä£"
+map -altgr +shift 0x56 0x2C..0x35           ~ ">YXCVBNM;:_"
+
+#
+# Keys requiring AltGr
+#
+
+map +altgr -shift 0x02..0x04                ~ "¦@#"
+map +altgr -shift 0x06..0x08 0x0C 0x0D      ~ "¬|¢´~"
+map +altgr -shift 0x1A 0x1B                 ~ "[]"
+map +altgr -shift 0x28 0x2B                 ~ "{}"
+map +altgr -shift 0x56                      ~ "\"
+
+map +altgr -shift 0x12 ~ "€"
+
+#
+# Dead keys
+#
+map -altgr -shift 0x1B ~ 0x00A8 # Dead key
+map +altgr -shift 0x0C ~ 0xFE51 # Dead acute
+map -altgr -shift 0x0D ~ 0xFE52 # Dead circumflex
+map -altgr +shift 0x0D ~ 0xFE50 # Dead grave
+map +altgr -shift 0x0D ~ 0xFE53 # Dead tilde