diff --git a/debian/changelog b/debian/changelog
index eea6c36..caa2126 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,42 +1,48 @@
+nm-tray (0.4.1-0ubuntu2) eoan; urgency=medium
+
+  * Changed connection editor to nm-connnection-editor
+
+ -- Hans P Möller <hmollercl@lubuntu.me>  Mon, 01 Jul 2019 10:28:06 -0400
+
 nm-tray (0.4.1-0ubuntu1) cosmic; urgency=medium
 
   * New upstream bugfix release.
   * Bump Standards-version to 4.2.1, no changes needed.
   * Remove the reverse-applicable fix-internal-version.patch.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 06 Oct 2018 16:59:03 -0500
 
 nm-tray (0.4.0-0ubuntu3) cosmic; urgency=medium
 
   * Blacklist from menus.
 
  -- Walter Lapchynski <wxl@ubuntu.com>  Tue, 18 Sep 2018 23:15:13 -0700
 
 nm-tray (0.4.0-0ubuntu2) cosmic; urgency=medium
 
   [ Simon Quigley ]
   * Update Vcs-* for the new location.
 
   [ Walter Lapchynski ]
   * generalize-terminal-for-edits.patch: Use x-terminal-emulator in lieu of
     xterm for connection editing. (LP: #1786978)
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 16 Aug 2018 01:11:08 -0500
 
 nm-tray (0.4.0-0ubuntu1) cosmic; urgency=medium
 
   * New upstream release.
   * Bump Standards-version to 4.1.5, no changes needed.
   * Remove gilir as an uploader as he has left the team.
   * Bump KF5 dependencies to 5.36.0.
   * Update copyright.
   * Remove upstream-applicable fix-xdg-install-dir.patch.
   * Bump internal version which was missed upstream.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 05 Jul 2018 17:46:18 -0500
 
 nm-tray (0.3.0-0ubuntu1) bionic; urgency=medium
 
   * Initial release.
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 10 Feb 2018 20:56:10 -0600
diff --git a/debian/patches/generalize-terminal-for-edits.patch b/debian/patches/generalize-terminal-for-edits.patch
deleted file mode 100644
index acbb64d..0000000
--- a/debian/patches/generalize-terminal-for-edits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Description: Use x-terminal emulator in lieu of xterm for connection edits.
-Author: Walter Lapchynski <wxl@ubuntu.com>
-Bug: https://launchpad.net/bugs/1786978
---- a/resources/nm-tray.conf
-+++ b/resources/nm-tray.conf
-@@ -1,3 +1,3 @@
- [General]
--connectionsEditor=xterm, -e, nmtui-edit
-+connectionsEditor=x-terminal-emulator, -e, nmtui-edit
- enableNotifications=true
diff --git a/debian/patches/nm-connection-editor.patch b/debian/patches/nm-connection-editor.patch
new file mode 100644
index 0000000..78d0ca9
--- /dev/null
+++ b/debian/patches/nm-connection-editor.patch
@@ -0,0 +1,10 @@
+Description: Use nm-connection-editor from network-manager-gnome for connection edits.
+Author: Hans P. Möller <hmollercl@lubuntu.me>
+Bug-Ubuntu: https://launchpad.net/bugs/1810095
+--- a/resources/nm-tray.conf
++++ b/resources/nm-tray.conf
+@@ -1,3 +1,3 @@
+ [General]
+-connectionsEditor=xterm, -e, nmtui-edit
++connectionsEditor=nm-connection-editor
+ enableNotifications=true
diff --git a/debian/patches/series b/debian/patches/series
index 7cdc5d4..bce1a1c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-generalize-terminal-for-edits.patch
+nm-connection-editor.patch
 blacklist-from-menu.patch