diff --git a/kbd-1.15.2-dumpkeys-C-opt.patch b/kbd-1.15.2-dumpkeys-C-opt.patch
index dbdd2a8..f6a3e1e 100644
--- a/kbd-1.15.2-dumpkeys-C-opt.patch
+++ b/kbd-1.15.2-dumpkeys-C-opt.patch
@@ -1,7 +1,7 @@
-Index: man/man1/dumpkeys.1.in
+Index: docs/man/man1/dumpkeys.1.in
 ===================================================================
---- man/man1/dumpkeys.1.in.orig
-+++ man/man1/dumpkeys.1.in
+--- docs/man/man1/dumpkeys.1.in.orig	2013-08-27 22:45:33.000000000 +0200
++++ docs/man/man1/dumpkeys.1.in	2014-09-12 13:42:01.557871837 +0200
 @@ -4,6 +4,7 @@
  dumpkeys \- dump keyboard translation tables
  .SH SYNOPSIS
@@ -10,7 +10,7 @@ Index: man/man1/dumpkeys.1.in
  [
  .B \-hilfn
  .BI \-c charset
-@@ -197,6 +198,12 @@ This option produces an output line `cha
+@@ -197,6 +198,12 @@
  loadkeys how to interpret the keymap. (For example, "division" is
  0xf7 in iso-8859-1 but 0xba in iso-8859-8.)
  .LP
@@ -25,35 +25,27 @@ Index: man/man1/dumpkeys.1.in
  .TP 20
 Index: src/dumpkeys.c
 ===================================================================
---- src/dumpkeys.c.orig
-+++ src/dumpkeys.c
-@@ -31,6 +31,7 @@
- static int fd;
- static int verbose;
- static int nr_keys = 0;			/* probably 112, 128, 256 or 512 */
-+static char * console;
- 
- int keymap_index[MAX_NR_KEYMAPS];	/* inverse of good_keymap */
- int good_keymap[MAX_NR_KEYMAPS], keymapnr, allocct;
-@@ -582,6 +583,8 @@ valid options are:\n\
+--- src/dumpkeys.c.orig	2014-06-15 20:33:18.000000000 +0200
++++ src/dumpkeys.c	2014-09-12 13:47:09.633866557 +0200
+@@ -41,6 +41,8 @@
  	   --funcs-only	    display only the function key strings\n\
  	   --keys-only	    display only key bindings\n\
  	   --compose-only   display only compose key combinations\n\
 +	-C <vc>\n\
 +	   --console=<vc>   Indicate the virtual console device to be used.\n\
  	-c --charset="));
- 	list_charsets(stderr);
+ 	lk_list_charsets(stderr);
  	fprintf(stderr, _("\
-@@ -593,7 +596,7 @@ valid options are:\n\
+@@ -52,7 +54,7 @@
  
  int
  main (int argc, char *argv[]) {
--	const char *short_opts = "hilvsnf1S:c:V";
-+	const char *short_opts = "hilvsnf1S:c:C:V";
+-	const char *short_opts = "hilvsnf1tkdS:c:V";
++	const char *short_opts = "hilvsnf1tkdS:C:c:V";
  	const struct option long_opts[] = {
  		{ "help",	no_argument,		NULL, 'h' },
  		{ "short-info",	no_argument,		NULL, 'i' },
-@@ -606,6 +609,7 @@ main (int argc, char *argv[]) {
+@@ -65,6 +67,7 @@
  		{ "keys-only",	no_argument,		NULL, 'k' },
  		{ "compose-only",no_argument,		NULL, 'd' },
  		{ "charset",	required_argument,	NULL, 'c' },
@@ -61,8 +53,16 @@ Index: src/dumpkeys.c
  		{ "verbose",	no_argument,		NULL, 'v' },
  		{ "version",	no_argument,		NULL, 'V' },
  		{ NULL,	0, NULL, 0 }
-@@ -665,6 +669,9 @@ main (int argc, char *argv[]) {
- 					usage();
+@@ -79,6 +82,7 @@
+ 	char funcs_only = 0;
+ 	char keys_only = 0;
+ 	char diac_only = 0;
++        char * console = NULL;
+ 
+ 	struct lk_ctx *ctx;
+ 
+@@ -135,6 +139,9 @@
+ 				}
  				printf("charset \"%s\"\n", optarg);
  				break;
 +			case 'C':
@@ -71,12 +71,12 @@ Index: src/dumpkeys.c
  			case 'V':
  				print_version_and_exit();
  			case 'h':
-@@ -676,7 +683,7 @@ main (int argc, char *argv[]) {
+@@ -146,7 +153,7 @@
  	if (optind < argc)
  		usage();
  
 -	fd = getfd(NULL);
 +	fd = getfd(console);
  
- 	find_nr_keys();
- 
+ 	/* check whether the keyboard is in Unicode mode */
+ 	if (ioctl(fd, KDGKBMODE, &kbd_mode)) {
diff --git a/kbd-2.0.2-doshell-reference.patch b/kbd-2.0.2-doshell-reference.patch
new file mode 100644
index 0000000..e56db7e
--- /dev/null
+++ b/kbd-2.0.2-doshell-reference.patch
@@ -0,0 +1,10 @@
+Index: docs/man/man1/openvt.1
+===================================================================
+--- docs/man/man1/openvt.1.orig	2013-08-27 22:45:33.000000000 +0200
++++ docs/man/man1/openvt.1	2014-09-12 11:48:08.465988937 +0200
+@@ -92,5 +92,4 @@
+ 
+ .SH "SEE ALSO"
+ .BR chvt (1),
+-.BR doshell (8),
+ .BR login (1)
diff --git a/kbd.changes b/kbd.changes
index da27987..d5ad023 100644
--- a/kbd.changes
+++ b/kbd.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Sep 18 10:54:51 UTC 2014 - pgajdos@suse.com
+
+- port dumpkeys-C-opt.patch
+- modified patches:
+  * kbd-1.15.2-dumpkeys-C-opt.patch
+
+-------------------------------------------------------------------
+Fri Sep 12 09:52:30 UTC 2014 - pgajdos@suse.com
+
+- kbd-2.0.2-doshell-reference.patch: 
+  drop doshell reference from openvt.1 man page [bnc#675317]
+
 -------------------------------------------------------------------
 Thu Sep  4 17:51:54 UTC 2014 - jw@owncloud.com
 
diff --git a/kbd.spec b/kbd.spec
index 5d09b59..adc8134 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -50,6 +50,7 @@ Patch5:         kbd-1.15.2-setfont-no-cruft.patch
 # TODO: no ideas how to port it.
 Patch6:         kbd-1.15.2-dumpkeys-C-opt.patch
 Patch9:         kbd-2.0.2-comment-typo-qwerty.patch
+Patch10:        kbd-2.0.2-doshell-reference.patch
 
 BuildRequires:  automake
 BuildRequires:  bison
@@ -89,8 +90,9 @@ Authors:
 %patch4 -p1
 %patch5 -p1
 # TODO: no ideas how to port it.
-# %%patch6
+%patch6
 %patch9
+%patch10
 
 %build
 for i in `find data/keymaps/mac -type f` ; do