diff --git a/.gitignore b/.gitignore
index 0990291..42f20e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ kbd-1.13wip.tar.gz
 kbd-1.15.tar.gz
 /kbd-1.15.2.tar.bz2
 /kbd-1.15.2.tar.bz2.sign
+/fr-dvorak.tar.bz2
diff --git a/kbd.spec b/kbd.spec
index e040ad6..add75a2 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,6 +1,6 @@
 Name:           kbd
 Version:        1.15.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -10,6 +10,7 @@ Source0:        ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2
 Source1:        ftp://ftp.kernel.org/pub/linux/utils/kbd/kbd-%{version}.tar.bz2.sign
 Source2:        kbd-latsun-fonts.tar.bz2
 Source3:        kbd-latarcyrheb-16-fixed.tar.bz2
+Source4:        fr-dvorak.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Patch0: installs translation file to right place
 Patch0:         kbd-1.15-po.patch
@@ -42,7 +43,7 @@ The %{name}-misc package contains data for kbd package - console fonts,
 keymaps etc. Please note that %{name}-misc is not helpful without kbd.
 
 %prep
-%setup -q -a 2 -a 3
+%setup -q -a 2 -a 3 -a 4
 %patch0 -p1 -b .po
 %patch1 -p1 -b .keycodes-man
 %patch2 -p1 -b .sparc
@@ -127,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 /lib/kbd
 
 %changelog
+* Thu Apr 21 2011 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.15.2-3
+- Add French Canadian Dvorak keymap
+  Resolves: #680989
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.15.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 6f5b414..0304f57 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@
 884fdbb0b952b2e3e8389a0c40a3e301  kbd-latarcyrheb-16-fixed.tar.bz2
 e850eb91e4d3b94b194efe8e953204c5  kbd-1.15.2.tar.bz2
 509b0bce718bf3cb9b631b0a69289751  kbd-1.15.2.tar.bz2.sign
+dd16ff8c6fa9d81490df28cbd68882eb  fr-dvorak.tar.bz2