diff -ruN build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/attributes/printer xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/attributes/printer
--- build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/attributes/printer	2003-11-19 22:13:21.000000000 -0600
+++ xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/attributes/printer	2004-08-01 22:51:58.000000000 -0600
@@ -22,18 +22,18 @@
 
 
 # Sample entry for the "PSspooldir" model
-# Just add a printer called "xp_ps_spooldir_tmp_Xprintjobs" to "Xprinters"
+# Just add a printer called "xp_ps_spooldir_HOME_Xprintjobs" to "Xprinters"
 # and you will get an extra printer which files the PostScript jobs
-# in the "/tmp/Xprintjobs/" directory.
-xp_ps_spooldir_tmp_Xprintjobs.xp-model-identifier: PSspooldir
+# in the "$HOME/Xprintjobs/" directory.
+xp_ps_spooldir_HOME_Xprintjobs.xp-model-identifier: PSspooldir
 
 # Sample entry for the "PS2PDFspooldir-GS" model
-# Just add a printer called "xp_pdf_spooldir_tmp_Xprintjobs" to "Xprinters"
+# Just add a printer called "xp_pdf_spooldir_HOME_Xprintjobs" to "Xprinters"
 # and you will get an extra printer which convertes the PostScript jobs
-# to PDF using "ps2pdf" and files them into the "/tmp/Xprintjobs/" directory.
+# to PDF using "ps2pdf" and files them into the "$HOME/Xprintjobs/" directory.
 # NOTE: Future versions of Xprint will use the PDF DDX instead directly
 # instead of relying on GhostScript/ps2pdf...
-xp_pdf_spooldir_tmp_Xprintjobs.xp-model-identifier: PS2PDFspooldir-GS
+xp_pdf_spooldir_HOME_Xprintjobs.xp-model-identifier: PS2PDFspooldir-GS
 
 
 # IMPORTANT EXAMPLES
diff -ruN build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Imakefile xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Imakefile
--- build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Imakefile	2003-11-19 22:13:21.000000000 -0600
+++ xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Imakefile	2004-08-01 22:52:17.000000000 -0600
@@ -7,9 +7,9 @@
 #if HasGhostScript
 all:: Xprinters.ghostscript
 
-# Enable the "xp_pdf_spooldir_tmp_Xprintjobs" printer if we have GS
+# Enable the "xp_pdf_spooldir_HOME_Xprintjobs" printer if we have GS
 Xprinters.ghostscript: Xprinters
-	sed <Xprinters "s/#Printer xp_pdf_spooldir_tmp_Xprintjobs/Printer xp_pdf_spooldir_tmp_Xprintjobs/" >Xprinters.ghostscript
+	sed <Xprinters "s/#Printer xp_pdf_spooldir_HOME_Xprintjobs/Printer xp_pdf_spooldir_HOME_Xprintjobs/" >Xprinters.ghostscript
 
 clean::
 	$(RM) Xprinters.ghostscript
diff -ruN build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config
--- build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config	2003-12-15 19:19:53.000000000 -0600
+++ xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/model-config	2004-08-01 22:49:46.000000000 -0600
@@ -20,7 +20,7 @@
 #
 # Attributes supported for this printer model
 *content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
-*descriptor: PDF job spool dir /tmp/Xprintjobs
+*descriptor: PDF job spool dir $HOME/Xprintjobs
 *document-formats-supported: {POSTSCRIPT 2}
 *input-trays-supported:
 *medium-source-sizes-supported: \
@@ -45,7 +45,7 @@
 }
 
 *plexes-supported: simplex duplex tumble
-*printer-model: "PDF job spool dir /tmp/Xprintjobs"
+*printer-model: "PDF job spool dir $HOME/Xprintjobs"
 # 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720,
 # 940, 1200 and 2440 are supported DPI values, we limit it here
 # to some common values:
@@ -60,7 +60,7 @@
 # Note that "%xpconfigdir%" is currently only supported in Xprt servers build
 # from xprint.mozdev.org sources, other platforms have replace it with the
 # absolute path name to the script
-*xp-spooler-command: %xpconfigdir%/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh -d /tmp/Xprintjobs -s .pdf -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%"
+*xp-spooler-command: %xpconfigdir%/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh -s .pdf -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%"
 
 # NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
 # xp-psddx-download-fonts defines which fonts should be downloaded as outlines
diff -ruN build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
--- build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh	2003-12-05 19:59:15.000000000 -0600
+++ xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh	2004-08-01 22:51:42.000000000 -0600
@@ -3,7 +3,7 @@
 export PATH
 
 verbose_msgs="false"
-DEFAULT_SPOOLDIR=/tmp/Xprintjobs
+DEFAULT_SPOOLDIR=`perl -e '@x = getpwuid($>); print $x[7]'`/Xprintjobs
 
 usage()
 {
@@ -74,7 +74,6 @@
 
 if [ ! -d "${DEFAULT_SPOOLDIR}" ] ; then 
   mkdir "${DEFAULT_SPOOLDIR}"
-  chmod a+rwxt "${DEFAULT_SPOOLDIR}"
 fi
 
 if [ "${permmask}" != "" ] ; then
diff -ruN build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/model-config xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/model-config
--- build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/model-config	2003-12-15 19:19:53.000000000 -0600
+++ xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/model-config	2004-08-01 22:14:49.000000000 -0600
@@ -19,7 +19,7 @@
 #
 # Attributes supported for this printer model
 *content-orientations-supported: portrait landscape reverse-portrait reverse-landscape
-*descriptor: PostScript job spool dir /tmp/Xprintjobs
+*descriptor: PostScript job spool dir $HOME/Xprintjobs
 *document-formats-supported: {POSTSCRIPT 2}
 *input-trays-supported:
 *medium-source-sizes-supported: \
@@ -44,7 +44,7 @@
 }
 
 *plexes-supported: simplex duplex tumble
-*printer-model: "PostScript job spool dir /tmp/Xprintjobs"
+*printer-model: "PostScript job spool dir $HOME/Xprintjobs"
 # 75, 100, 120, 150, 180, 200, 240, 300, 360, 400, 600, 720,
 # 940, 1200 and 2440 are supported DPI values, we limit it here
 # to some common values:
@@ -59,7 +59,7 @@
 # Note that "%xpconfigdir%" is currently only supported in Xprt servers build
 # from xprint.mozdev.org sources, other platforms have replace it with the
 # absolute path name to the script
-*xp-spooler-command: %xpconfigdir%/C/print/models/PSspooldir/spooltodir.sh -d /tmp/Xprintjobs -s .ps -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%"
+*xp-spooler-command: %xpconfigdir%/C/print/models/PSspooldir/spooltodir.sh -s .ps -u 077 -p %printer-name% -c %copy-count% -t %job-name% -o "%options%"
 
 # NOTE: xp-psddx-* attributes are EXPERIMENTAL for now.
 # xp-psddx-download-fonts defines which fonts should be downloaded as outlines
diff -ruN build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/spooltodir.sh xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/spooltodir.sh
--- build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/spooltodir.sh	2002-11-24 18:39:18.000000000 -0600
+++ xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/models/PSspooldir/spooltodir.sh	2004-08-01 22:51:28.000000000 -0600
@@ -3,7 +3,7 @@
 export PATH
 
 verbose_msgs="false"
-DEFAULT_SPOOLDIR=/tmp/Xprintjobs
+DEFAULT_SPOOLDIR=`perl -e '@x = getpwuid($>); print $x[7]'`/Xprintjobs
 
 usage()
 {
@@ -74,7 +74,6 @@
 
 if [ ! -d "${DEFAULT_SPOOLDIR}" ] ; then 
   mkdir "${DEFAULT_SPOOLDIR}"
-  chmod a+rwxt "${DEFAULT_SPOOLDIR}"
 fi
 
 if [ "${permmask}" != "" ] ; then
diff -ruN build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Xprinters xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Xprinters
--- build-tree/xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Xprinters	2003-12-05 19:44:55.000000000 -0600
+++ xprint/src/xprint_main/xc/programs/Xserver/XpConfig/C/print/Xprinters	2004-08-01 22:52:33.000000000 -0600
@@ -30,10 +30,10 @@
 
 ########################################################################
 # Preconfigured entry for the PSspooldir model
-# (which sends jobs to /tmp/Xprintjobs instead to a physical printer)
+# (which sends jobs to $HOME/Xprintjobs instead to a physical printer)
 ########################################################################
-#Printer xp_pdf_spooldir_tmp_Xprintjobs
-Printer xp_ps_spooldir_tmp_Xprintjobs
+#Printer xp_pdf_spooldir_HOME_Xprintjobs
+Printer xp_ps_spooldir_HOME_Xprintjobs
 
 ########################################################################
 # Add individual printers to the list of printers managed by the