diff --git a/[refs] b/[refs]
index 8cbad1506f3b8..ab86f892a5b8d 100644
--- a/[refs]
+++ b/[refs]
@@ -16,7 +16,7 @@ refs/heads/joyent/feature/backports/2014Q4: 3232a64a5168ce852618c5f73f53cd7e3882
 "refs/heads/pkgsrc_2014Q3": 99948a6fafef34026404ddbbe23c1d65973ab443
 refs/heads/joyent/feature/cwrapper/trunk: e3a9d739ecda0f585205935a72cfc8d522e47786
 refs/heads/joyent/feature/cwrappers/trunk: 2e5d2f04ece2ca36ca032ddb92ac03c5d5edef99
-refs/heads/joyent/feature/dash/trunk: b869452589a83acfbaddb0305fc8106cab4bd58a
+refs/heads/joyent/feature/dash/trunk: 21e50134f92d7ca69ce8d3770ee26e24291a0d02
 "refs/heads/pkgsrc_2013Q4": c7c4560209d65ff7b93176c84a1586fd8a5a3dde
 "refs/heads/pkgsrc_2013Q3": a694d11d96f9e0a87fc683c6a4a9a4d5dcbf79f8
 "refs/heads/pkgsrc_2013Q2": cb4803fea21e7329909054eb3b7741fed41fe969
diff --git a/branches/joyent/feature/dash/trunk/print/xpp/distinfo b/branches/joyent/feature/dash/trunk/print/xpp/distinfo
index 098959e0b9526..30504cd5e12a1 100644
--- a/branches/joyent/feature/dash/trunk/print/xpp/distinfo
+++ b/branches/joyent/feature/dash/trunk/print/xpp/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2010/05/09 04:21:40 sbd Exp $
+$NetBSD: distinfo,v 1.10 2011/12/06 19:48:47 joerg Exp $
 
 SHA1 (xpp-1.5.tar.gz) = 7f3c1427979516e47402a0acb708eb83b68daa61
 RMD160 (xpp-1.5.tar.gz) = a64ec4c93013d1db08a6c9b6705b43850c36c337
@@ -6,5 +6,6 @@ Size (xpp-1.5.tar.gz) = 107755 bytes
 SHA1 (patch-aa) = f8df413715f4f9319f8d52358a99e54d31cd5a6f
 SHA1 (patch-ab) = 76d0ca39bef410e580f805ca10a3d953285c58bb
 SHA1 (patch-ac) = d94f9359d19de5dff684f61a53af4607bb31f78c
-SHA1 (patch-ad) = 8cda85598eb8a8621aed9293e532c1aa9a2603c0
+SHA1 (patch-ad) = 5af9e367c1b025ec1d9940101a8b3338d84ae5d6
 SHA1 (patch-ae) = a9adc82236847b2749eceacc4b00b2973dd80058
+SHA1 (patch-cupshelper.cxx) = beba4e1af0ff8a95d5d6042bd39254aa6e1d1e21
diff --git a/branches/joyent/feature/dash/trunk/print/xpp/patches/patch-ad b/branches/joyent/feature/dash/trunk/print/xpp/patches/patch-ad
index 1bd97dbee5667..3a4b59f25b104 100644
--- a/branches/joyent/feature/dash/trunk/print/xpp/patches/patch-ad
+++ b/branches/joyent/feature/dash/trunk/print/xpp/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2007/11/30 19:35:12 rillig Exp $
+$NetBSD: patch-ad,v 1.2 2011/12/06 19:48:47 joerg Exp $
 
 --- xpp.h.orig	2004-12-06 17:59:35.000000000 +0000
-+++ xpp.h	2007-11-30 19:24:17.000000000 +0000
-@@ -177,7 +177,7 @@ public:
++++ xpp.h
+@@ -36,6 +36,7 @@
+ #include <cups/cups.h>
+ #include <cups/ipp.h>
+ #include <cups/language.h>
++#include <cups/ppd.h>
+ #include <FL/Fl.H>
+ #include <FL/Fl_Window.H>
+ #include <FL/Fl_Box.H>
+@@ -177,7 +178,7 @@ public:
     */
  
    int /* O - index of the record of the given option in the array */
diff --git a/branches/joyent/feature/dash/trunk/print/xpp/patches/patch-cupshelper.cxx b/branches/joyent/feature/dash/trunk/print/xpp/patches/patch-cupshelper.cxx
new file mode 100644
index 0000000000000..5ebc01ac997e2
--- /dev/null
+++ b/branches/joyent/feature/dash/trunk/print/xpp/patches/patch-cupshelper.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-cupshelper.cxx,v 1.1 2011/12/06 19:48:47 joerg Exp $
+
+--- cupshelper.cxx.orig	2011-12-06 14:22:14.000000000 +0000
++++ cupshelper.cxx
+@@ -34,6 +34,7 @@
+ #include "cupshelper.h"
+ #include "passworddialog.h"
+ 
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <cups/language.h>
+