6 files changed, 13 insertions, 6 deletions
diff --git a/cloud_print/service/DEPS b/cloud_print/DEPS
index 33757a3..75fed87 100644
--- a/cloud_print/service/DEPS
+++ b/cloud_print/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
   "+chrome/installer/launcher_support",
+  "+grit",  # For generated headers
   "+net",
 ]
diff --git a/cloud_print/virtual_driver/GCP-driver.ppd b/cloud_print/virtual_driver/gcp-driver.ppd
index 422c0d3..e54b8c6 100644
--- a/cloud_print/virtual_driver/GCP-driver.ppd
+++ b/cloud_print/virtual_driver/gcp-driver.ppd
@@ -4,7 +4,7 @@
 *FileVersion:	"1.1"
 *LanguageVersion: English
 *LanguageEncoding: ISOLatin1
-*PCFileName:	"GOOGLE-CLOUD-PRINT.PPD"
+*PCFileName:	"gcp-driver.ppd"
 *Manufacturer:	"Google Inc."
 *Product:	"(CUPS v1.1)"
 *ModelName:     "GCP Virtual Driver"
diff --git a/cloud_print/virtual_driver/win/install/DEPS b/cloud_print/virtual_driver/win/install/DEPS
deleted file mode 100644
index 9d41d53..0000000
--- a/cloud_print/virtual_driver/win/install/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+grit",  # For generated headers
-]
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index 9a5efb5..f4e81007 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -29,7 +29,7 @@ namespace {
 const wchar_t kVersionKey[] = L"pv";
 const wchar_t kNameKey[] = L"name";
 const wchar_t kNameValue[] = L"GCP Virtual Driver";
-const wchar_t kPpdName[] = L"GCP-DRIVER.PPD";
+const wchar_t kPpdName[] = L"gcp-driver.ppd";
 const wchar_t kDriverName[] = L"MXDWDRV.DLL";
 const wchar_t kUiDriverName[] = L"PS5UI.DLL";
 const wchar_t kHelpName[] = L"PSCRIPT.HLP";
diff --git a/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp b/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
index deb36e7..106f873 100644
--- a/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
+++ b/cloud_print/virtual_driver/win/install/virtual_driver_install.gyp
@@ -86,6 +86,14 @@
           ],
         },
       },
+      'copies': [
+        {
+          'destination': '<(PRODUCT_DIR)',
+          'files': [
+            '../../GCP-driver.ppd',
+          ],
+        },
+      ], 
     },
     {
       'target_name': 'virtual_driver_setup_resources',
diff --git a/cloud_print/virtual_driver/win/virtual_driver.gypi b/cloud_print/virtual_driver/win/virtual_driver.gypi
index 2367dbd..1c57af9 100644
--- a/cloud_print/virtual_driver/win/virtual_driver.gypi
+++ b/cloud_print/virtual_driver/win/virtual_driver.gypi
@@ -25,7 +25,7 @@
         'virtual_driver_consts.h',
         'virtual_driver_helpers.cc',
         'virtual_driver_helpers.h',
-        ],
+      ],
     },
     {
       'target_name': 'gcp_portmon_lib<(virtual_driver_suffix)',
@@ -42,6 +42,7 @@
       'target_name': 'gcp_portmon<(virtual_driver_suffix)',
       'type': 'loadable_module',
       'sources': [
+        'port_monitor/port_monitor.def',
         'port_monitor/port_monitor_dll.cc',
         'virtual_driver_common_resources.rc',
       ],