diff --git a/freerdp.changes b/freerdp.changes
index 883df7c..d9c9de2 100644
--- a/freerdp.changes
+++ b/freerdp.changes
@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Thu Mar  7 09:10:15 UTC 2013 - bruno@ioda-net.ch
+
+- Added patch for issue #811 fixing divide key (/) on keypad for 1.0x series
+  commit https://github.com/bmiklautz/FreeRDP/commit/e0cc1e60657b5883a907e5da2f70eb27bf0b91f1
+
+- Added changelog
+
+  FreeRDP 1.0.2 is a maintenance release which contains several bug and stability fixes.
+* xfreerdp:
+* new parameter --from-stdin - prompts for unspecified arguments username, password, domain and host.
+* fix compability with x2go
+* fix keyboard state in remote app
+* documentation fixes
+* fixed crash when started with --authonly (#843)
+
+* libfreerdp-core:
+* several memory leaks and double frees were fixed
+* support for FastPath PDUs up to 32767
+* register audio only if plugin is registered
+* load extensions after argument parsing
+
+* libfreerdp-utils:
+* fixed crash when HOME environment variable wasn't set
+
+* xfreerdp-server
+* deadlock fixed
+* accept TLSv1 and SSLv3
+
+* smartcard
+* don't incorrectly set SCARD_STATE_IGNORE
+
+* libfreerdp-codec
+* performance improvement
+
+* libfreerdp-gdi
+* support for PatBlt DPa operation
+
+* plugin
+* ignore CHANNEL_FLAG_SUSPEND/CHANNEL_FLAG_RESUME to prevent possible crash
+
+For a detailed list of changes use "git log 1.0.1..1.0.2"
+known problems:
+
+* If windows input language is set to german pressing the divde key (/) on the keypad
+  results in minus (-) (see issue #811) 
+
 -------------------------------------------------------------------
 Thu Jan 24 14:42:37 UTC 2013 - kkaempf@suse.com
 
diff --git a/freerdp.spec b/freerdp.spec
index dbf6b3b..9ad4407 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -30,6 +30,8 @@ Source0:        https://github.com/downloads/FreeRDP/FreeRDP/%{name}-%{version}.
 Patch1:         freerdp-fix-FindPCSC-macro.patch
 # PATCH-FIX-UPSTREAM freerdp-fix-pulse-no-device-name.patch bnc#785437 gber@opensuse.org -- Fix a segfault in case device name is not provided
 Patch4:         freerdp-handle-null-device-name.patch
+# PATCH-FIX-UPSTREAM (wip) fix handle of kpdivide on keypad - issue #831
+Patch5:         freerdp_branch-1.0.x_fix-kpdivide-issue831.patch
 BuildRequires:  cmake
 BuildRequires:  cups-devel
 BuildRequires:  ed
@@ -79,6 +81,7 @@ based on libfreerdp.
 %setup -q -n FreeRDP-%{version}
 %patch1 -p1
 %patch4 -p1
+%patch5 -p1
 # use a versioned subdirectory for plugins in order to comply with the shared
 # library policy
 ed -s CMakeLists.txt 2>/dev/null <<'EOF'
@@ -110,7 +113,7 @@ cd build
 %make_install
 
 # remove keymaps as we make use of libxkbfile
-rm -rf $RPM_BUILD_ROOT/usr/share/freerdp/keymaps/
+# rm -rf $RPM_BUILD_ROOT/usr/share/freerdp/keymaps/
 
 %post   -n %{libname} -p /sbin/ldconfig
 
diff --git a/freerdp_branch-1.0.x_fix-kpdivide-issue831.patch b/freerdp_branch-1.0.x_fix-kpdivide-issue831.patch
new file mode 100644
index 0000000..48c50bd
--- /dev/null
+++ b/freerdp_branch-1.0.x_fix-kpdivide-issue831.patch
@@ -0,0 +1,11 @@
+--- a/include/freerdp/kbd/vkcodes.h	2013-03-07 10:21:12.591964852 +0100
++++ b/include/freerdp/kbd/vkcodes.h	2013-03-07 10:21:19.825964976 +0100
+@@ -434,7 +434,7 @@
+ 	{ 0x00, 0, "VK_SEPARATOR"        , NULL   },
+ 	{ 0x4A, 0, "VK_SUBTRACT"         , "KPSU" },
+ 	{ 0x53, 0, "VK_DECIMAL"          , "KPDL" },
+-	{ 0x35, 0, "VK_DIVIDE"           , "KPDV" },
++	{ 0x35, 1, "VK_DIVIDE"           , "KPDV" },
+ 	{ 0x3B, 0, "VK_F1"               , "FK01" },
+ 	{ 0x3C, 0, "VK_F2"               , "FK02" },
+ 	{ 0x3D, 0, "VK_F3"               , "FK03" },