Index: doc/help/ref-ppdcfile.html
===================================================================
--- doc/help/ref-ppdcfile.html	(revision 8676)
+++ doc/help/ref-ppdcfile.html	(working copy)
@@ -98,6 +98,34 @@
 case-insensitive and can be any sequence of letters, numbers,
 and the underscore. The value can be any valid expression.</p>
 
+<h3>Predefined Names</h3>
+
+<p>The following <code>#define</code> names are set by the PPD compiler:</p>
+
+<ul>
+
+	<li><code>CUPS_VERSION</code> - The full CUPS version string, e.g.
+	"1.4.0"</li>
+
+	<li><code>CUPS_VERSION_MAJOR</code> - The major version number, e.g.
+	"1"</li>
+
+	<li><code>CUPS_VERSION_MINOR</code> - The minor version number, e.g.
+	"4"</li>
+
+	<li><code>CUPS_VERSION_PATCH</code> - The patch version number, e.g.
+	"0"</li>
+
+	<li><code>PLATFORM_NAME</code> - The operating system name used by the
+	current system as reported by "uname" ("Windows" on Microsoft
+	Windows)</li>
+
+	<li><code>PLATFORM_ARCH</code> - The processor architecture used by the
+	current system as reported by "uname -m" ("X86" or "X64" on Microsoft
+	Windows)</li>
+
+</ul>
+
 <h3>See Also</h3>
 
 <p><a href='#_include'><code>#include</code></a></p>
Index: ppdc/ppdc-source.cxx
===================================================================
--- ppdc/ppdc-source.cxx	(revision 8676)
+++ ppdc/ppdc-source.cxx	(working copy)
@@ -71,6 +71,9 @@
 #include "data/hp.h"
 #include "data/label.h"
 #include "data/pcl.h"
+#ifndef WIN32
+#  include <sys/utsname.h>
+#endif // !WIN32
 
 
 //
@@ -110,6 +113,25 @@
   cond_current  = cond_stack;
   cond_stack[0] = PPDC_COND_NORMAL;
 
+  // Add standard #define variables...
+#define MAKE_STRING(x) #x
+
+  vars->add(new ppdcVariable("CUPS_VERSION", MAKE_STRING(CUPS_VERSION)));
+  vars->add(new ppdcVariable("CUPS_VERSION_MAJOR", MAKE_STRING(CUPS_VERSION_MAJOR)));
+  vars->add(new ppdcVariable("CUPS_VERSION_MINOR", MAKE_STRING(CUPS_VERSION_MINOR)));
+  vars->add(new ppdcVariable("CUPS_VERSION_PATCH", MAKE_STRING(CUPS_VERSION_PATCH)));
+
+#ifdef WIN32
+  vars->add(new ppdcVariable("PLATFORM_NAME", "Windows"));
+  vars->add(new ppdcVariable("PLATFORM_ARCH", "X86"));
+
+#else
+  struct utsname name;			// uname information
+
+  vars->add(new ppdcVariable("PLATFORM_NAME", name.sysname));
+  vars->add(new ppdcVariable("PLATFORM_ARCH", name.machine));
+#endif // WIN32
+
   if (f)
     read_file(f, ffp);
 }