diff -Nru gnome-bluetooth-3.28.0/debian/changelog gnome-bluetooth-3.28.0/debian/changelog
--- gnome-bluetooth-3.28.0/debian/changelog	2019-01-11 19:41:45.000000000 +0000
+++ gnome-bluetooth-3.28.0/debian/changelog	2019-04-12 13:25:10.000000000 +0000
@@ -1,3 +1,15 @@
+gnome-bluetooth (3.28.0-2ubuntu0.2) bionic; urgency=medium
+
+  * debian/patches/git_set_trusted.patch,
+    debian/patches/git_pair_pointer.patch:
+    - backport upstream commits to fix marking of device trusted on pairing
+      not always working (leading to auto-reconnect not working).
+      Always try to pair pointer devices also, that's expected by most
+      recent devices, removing the specific list of devices which should
+      use the default PIN and do that for all devices (lp: #1779289)
+    
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 12 Apr 2019 15:06:49 +0200
+
 gnome-bluetooth (3.28.0-2ubuntu0.1) bionic-security; urgency=medium
 
   * SECURITY UPDATE: work around bluetoothd discoverability issue
diff -Nru gnome-bluetooth-3.28.0/debian/patches/git_pair_pointer.patch gnome-bluetooth-3.28.0/debian/patches/git_pair_pointer.patch
--- gnome-bluetooth-3.28.0/debian/patches/git_pair_pointer.patch	1970-01-01 00:00:00.000000000 +0000
+++ gnome-bluetooth-3.28.0/debian/patches/git_pair_pointer.patch	2019-04-12 13:17:38.000000000 +0000
@@ -0,0 +1,62 @@
+From 4f1e0b355a568cbfd406ec95a375e44d42904cdc Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 22 Mar 2019 16:52:27 +0100
+Subject: [PATCH] lib: Always try to pair pointer devices
+
+Back in the heady Bluetooth 2.0 days, the majority of pointer devices
+could work without pairing, and some did not even support pairing.
+
+But pointer devices really want pairing for all the subsequent versions
+(from "Secure Simple Pairing" in Bluetooth 2.1, 2007), so always try to
+pair pointer devices.
+---
+ lib/pin-code-database.xml | 26 --------------------------
+ 1 file changed, 26 deletions(-)
+
+Index: gnome-bluetooth-3.28.0/lib/pin-code-database.xml
+===================================================================
+--- gnome-bluetooth-3.28.0.orig/lib/pin-code-database.xml
++++ gnome-bluetooth-3.28.0/lib/pin-code-database.xml
+@@ -61,22 +61,6 @@
+ 	     with a OUI from Alps Electric -->
+ 	<device vendor="alps" name="BD Remote Control" pin="NULL"/>
+ 
+-	<!-- Apple Wireless and Mighty Mouse
+-	     Note: Apple doesn't follow the specs, and requires their mice
+-	     to be paired -->
+-	<device vendor="apple" type="mouse" pin="0000"/>
+-
+-	<!-- Apple Magic Trackpad
+-	     Note: same as above, tablet needs to be paired -->
+-	<device vendor="apple" type="tablet" pin="0000"/>
+-
+-	<!-- Microsoft mice
+-	     Again, same as above -->
+-	<device oui="7C:1E:52:" type="mouse" name="Microsoft Wedge Touch Mouse" pin="0000"/>
+-	<device oui="00:1D:D8:" type="mouse" name="Microsoft Wireless Notebook Presenter Mouse 8000" pin="0000"/>
+-	<device oui="28:18:78:" type="mouse" name="Microsoft Sculpt Comfort Mouse" pin="0000"/>
+-	<device oui="30:59:B7:" type="mouse" name="Microsoft Sculpt Comfort Mouse" pin="0000"/>
+-
+ 	<!-- BT-GPS8 JENTRO, GPS mouse -->
+ 	<device oui="00:0D:B5:" name="BT-GPS8 JENTRO" pin="0000"/>
+ 
+@@ -86,9 +70,6 @@
+ 	<!-- ION iCade Game Controller -->
+ 	<device name="iCade" type="keyboard" pin="ICADE"/>
+ 
+-	<!-- Logitech Ultrathin Touch Mouse -->
+-	<device oui="00:1F:20:" name="Ultrathin Touch Mouse" pin="0000"/>
+-
+ <!-- GPS devices -->
+ 	<device oui="00:0D:B5:" name="TomTom Wireless GPS MkII" pin="0000"/>
+ 	<device oui="00:0D:B5:" name="GPS-GW-005" pin="0000"/>
+@@ -161,9 +142,6 @@
+ 
+ <!-- Generic types -->
+ 
+-	<!-- Mice don't usually need pincodes -->
+-	<device type="mouse" pin="NULL"/>
+-
+ 	<!-- Printers -->
+ 	<device type="printer" pin="0000"/>
+ 
diff -Nru gnome-bluetooth-3.28.0/debian/patches/git_set_trusted.patch gnome-bluetooth-3.28.0/debian/patches/git_set_trusted.patch
--- gnome-bluetooth-3.28.0/debian/patches/git_set_trusted.patch	1970-01-01 00:00:00.000000000 +0000
+++ gnome-bluetooth-3.28.0/debian/patches/git_set_trusted.patch	2019-04-12 13:10:13.000000000 +0000
@@ -0,0 +1,31 @@
+From e807cbd80adead977a1f53443b00b6dc9a947245 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Fri, 22 Mar 2019 16:03:01 +0100
+Subject: [PATCH] client: Fix bluetooth_client_set_trusted() not working
+
+The guard was guarding against a local variable ("device") being
+NULL, instead guarding against one of the arguments ("device_path")
+being NULL. Depending on the compiler and runtime, this would probably
+fail most of the time, leading to problems using non-pairing devices
+after the initial setup.
+
+bluetooth_client_set_trusted: assertion 'device != NULL' failed
+
+Fixes: 27e88fc0119d6c423caade21b575d9f66f15c5ce
+---
+ lib/bluetooth-client.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gnome-bluetooth-3.28.0/lib/bluetooth-client.c
+===================================================================
+--- gnome-bluetooth-3.28.0.orig/lib/bluetooth-client.c
++++ gnome-bluetooth-3.28.0/lib/bluetooth-client.c
+@@ -1490,7 +1490,7 @@ bluetooth_client_set_trusted (BluetoothC
+ 	GtkTreeIter iter;
+ 
+ 	g_return_val_if_fail (BLUETOOTH_IS_CLIENT (client), FALSE);
+-	g_return_val_if_fail (device != NULL, FALSE);
++	g_return_val_if_fail (device_path != NULL, FALSE);
+ 
+ 	if (get_iter_from_path (priv->store, &iter, device_path) == FALSE) {
+ 		g_debug ("Couldn't find device '%s' in tree to mark it as trusted", device_path);
diff -Nru gnome-bluetooth-3.28.0/debian/patches/series gnome-bluetooth-3.28.0/debian/patches/series
--- gnome-bluetooth-3.28.0/debian/patches/series	2019-01-11 19:41:39.000000000 +0000
+++ gnome-bluetooth-3.28.0/debian/patches/series	2019-04-12 13:18:46.000000000 +0000
@@ -1 +1,3 @@
 CVE-2018-10910.patch
+git_set_trusted.patch
+git_pair_pointer.patch