diff --git a/src/protocols/rdp/Makefile.am b/src/protocols/rdp/Makefile.am
index 5e74a13b..7ad8e0d8 100644
--- a/src/protocols/rdp/Makefile.am
+++ b/src/protocols/rdp/Makefile.am
@@ -108,7 +108,8 @@ rdp_keymaps =                   \
     keymaps/base.keymap         \
     keymaps/failsafe.keymap     \
     keymaps/de_de_qwertz.keymap \
-    keymaps/en_us_qwerty.keymap
+    keymaps/en_us_qwerty.keymap \
+    keymaps/fr_fr_azerty.keymap
 
 _generated_keymaps.c: $(rdp_keymaps)
 	keymaps/generate.pl $(rdp_keymaps)
diff --git a/src/protocols/rdp/keymaps/fr_fr_azerty.keymap b/src/protocols/rdp/keymaps/fr_fr_azerty.keymap
new file mode 100644
index 00000000..19847299
--- /dev/null
+++ b/src/protocols/rdp/keymaps/fr_fr_azerty.keymap
@@ -0,0 +1,56 @@
+#
+# Copyright (C) 2013 Glyptodon LLC
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+parent  "base"
+name    "fr-fr-azerty"
+freerdp "KBD_FRENCH"
+
+#
+# Basic keys
+#
+
+map -altgr -shift 0x29 0x02..0x0D      ~ "²&é"'(-è_çà)="
+map -altgr -shift      0x10..0x19 0x1B ~ "azertyuiop$"
+map -altgr -shift      0x1E..0x28 0x2B ~ "qsdfghjklmù*"
+map -altgr -shift 0x56 0x2C..0x35      ~ "<wxcvbn,;:!"
+
+map -altgr +shift      0x02..0x0D      ~ "1234567890°+"
+map -altgr +shift      0x10..0x19 0x1B ~ "AZERTYUIOP£"
+map -altgr +shift      0x1E..0x28 0x2B ~ "QSDFGHJKLM%µ"
+map -altgr +shift 0x56 0x2C..0x35      ~ ">WXCVBN?./§"
+
+#
+# Keys requiring AltGr
+#
+
+map +altgr -shift 0x03..0x0D ~ "~#{[|`\^@]}"
+
+map +altgr -shift 0x12 ~ "€"
+map +altgr -shift 0x1B ~ "¤"
+
+#
+# Dead keys
+#
+
+map -altgr -shift 0x1A ~ 0xFE52 # Dead circumflex
+map -altgr +shift 0x1A ~ 0xFE57 # Dead umlaut
+