diff -Nru onboard-1.2.0/debian/changelog onboard-1.2.0/debian/changelog
--- onboard-1.2.0/debian/changelog	2016-02-25 20:43:00.000000000 +0100
+++ onboard-1.2.0/debian/changelog	2016-02-25 20:47:30.000000000 +0100
@@ -1,3 +1,13 @@
+onboard (1.2.0-0ubuntu3) xenial; urgency=medium
+
+  * debian/patches/add_defaults_for_ubuntu.patch:
+    - Add comments about where to find info about more keys
+    - Add keys about docking and expending the Onboard window
+    - Enable docking of Onboard window (LP: #1546654)
+    - Enable expanding in portrait and landscape mode (LP: #1546654)
+
+ -- Francesco Fumanti <francesco.fumanti@gmx.net>  Thu, 25 Feb 2016 20:46:36 +0100
+
 onboard (1.2.0-0ubuntu2) xenial; urgency=medium
 
   * debian/patches/add_defaults_for_ubuntu.patch: refresh patch
diff -Nru onboard-1.2.0/debian/patches/add_defaults_for_ubuntu.patch onboard-1.2.0/debian/patches/add_defaults_for_ubuntu.patch
--- onboard-1.2.0/debian/patches/add_defaults_for_ubuntu.patch	2016-02-25 20:41:56.000000000 +0100
+++ onboard-1.2.0/debian/patches/add_defaults_for_ubuntu.patch	2016-02-25 19:16:51.000000000 +0100
@@ -1,8 +1,8 @@
 Index: onboard-1.2.0/onboard-defaults.conf
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ onboard-1.2.0/onboard-defaults.conf	2016-02-25 20:41:32.000000000 +0100
-@@ -0,0 +1,247 @@
++++ onboard-1.2.0/onboard-defaults.conf	2016-02-25 19:16:40.742084609 +0100
+@@ -0,0 +1,257 @@
 +# Copyright © 2011 Francesco Fumanti <francesco.fumanti@gmx.net>
 +# Copyright © 2011-2016 marmuta <marmvta@gmail.com>
 +#
@@ -33,6 +33,14 @@
 +# Keys have to start in column 0. A whitespace in column 0 indicates
 +# a line continuation.
 +#
++# More complete descriptions of the keys and their allowed values can be
++# found in Onboard's gsettings schemas. Navigate to 'org.onboard' in
++# dconf-editor, or read the schema definitions at
++# /usr/share/glib-2.0/schemas/org.onboard.gschema.xml.
++#
++# In general, any of the available keys in gsettings below 'org.onboard'
++# can be added here.
++#
 +
 +[main]
 +
@@ -127,39 +135,41 @@
 +#key-label-overrides={"LWIN": ["win", "super"]}
 +
 +[window]
-+# Show always on visible workspace
-+# Show keyboard and icon palette always on visible workspace.
-+#
-+# Examples:
-+#window-state-sticky=True
-+
 +#background-transparency=10.0
++#docking-edge=bottom
++docking-enabled=True
++#docking-monitor=active
++#docking-shrink-workarea=True
 +#enable-inactive-transparency=False
 +force-to-top=True
 +#inactive-transparency=50.0
 +#inactive-transparency-delay=1.0
-+#window-handles=E SE S SW W NW N NE M
++#keep-aspect-ratio=False
 +#transparency=0.0
 +#transparent-background=False
 +#window-decoration=False
++#window-handles=E SE S SW W NW N NE M
++#window-state-sticky=True
 +
++# Settings of the keyboard window on landscape screens.
 +[window.landscape]
-+# Position and size of the keyboard window on landscape screens.
-+#
-+# Examples:
 +#x=40
 +#y=40
 +#width=800
 +#height=300
++#dock-width=700
++#dock-height=205
++dock-expand=True
 +
++# Settings of the keyboard window on portrait screens.
 +[window.portrait]
-+# Position and size of the keyboard window on portrait screens.
-+#
-+# Examples:
 +#x=40
 +#y=40
 +#width=800
 +#height=300
++#dock-width=600
++#dock-height=200
++#dock-expand=False
 +
 +[icon-palette]
 +#in-use = False
@@ -253,7 +263,7 @@
 Index: onboard-1.2.0/setup.py
 ===================================================================
 --- onboard-1.2.0.orig/setup.py	2016-02-18 15:35:30.000000000 +0100
-+++ onboard-1.2.0/setup.py	2016-02-25 20:41:32.000000000 +0100
++++ onboard-1.2.0/setup.py	2016-02-24 14:29:30.000000000 +0100
 @@ -354,6 +354,7 @@
                    ('share/onboard', glob.glob('HACKING')),
                    ('share/onboard', glob.glob('NEWS')),