diff -Nru ppp-2.4.7/debian/changelog ppp-2.4.7/debian/changelog
--- ppp-2.4.7/debian/changelog	2018-11-09 19:32:52.000000000 +0100
+++ ppp-2.4.7/debian/changelog	2019-02-08 17:37:29.000000000 +0100
@@ -1,3 +1,10 @@
+ppp (2.4.7-2+4ubuntu3) disco; urgency=medium
+
+  * debian/extra/ip-up.d/0000usepeerdns: Added NetworkManager check, which
+    lets the script exit when NetworkManager is in use (LP: #1778946).
+
+ -- Till Kamppeter <till.kamppeter@gmail.com>  Fri, 08 Feb 2019 17:37:29 +0100
+
 ppp (2.4.7-2+4ubuntu2) disco; urgency=medium
 
   * debian/patches/3c7b86229f7bd2600d74db14b1fe5b3896be3875.patch:
diff -Nru ppp-2.4.7/debian/extra/ip-up.d/0000usepeerdns ppp-2.4.7/debian/extra/ip-up.d/0000usepeerdns
--- ppp-2.4.7/debian/extra/ip-up.d/0000usepeerdns	2018-11-04 17:50:33.000000000 +0100
+++ ppp-2.4.7/debian/extra/ip-up.d/0000usepeerdns	2019-02-08 14:57:16.000000000 +0100
@@ -6,6 +6,13 @@
 # exit if the resolvconf package is installed
 [ -x /sbin/resolvconf ] && exit 0
 
+case "$6" in
+  nm-pptp-service-*|nm-l2tp-service-*|/org/freedesktop/NetworkManager/PPP/*)
+        # NetworkManager handles it
+        exit 0
+        ;;
+esac
+
 # create the file if it does not exist
 if [ ! -e /etc/resolv.conf ]; then
   : > /etc/resolv.conf