diff --git a/pandatool/src/cvscopy/cvsCopy.cxx b/pandatool/src/cvscopy/cvsCopy.cxx
index 189ad9afab..8f036374e9 100644
--- a/pandatool/src/cvscopy/cvsCopy.cxx
+++ b/pandatool/src/cvscopy/cvsCopy.cxx
@@ -209,7 +209,11 @@ handle_args(Args &args) {
     return false;
   }
 
-  copy(args.begin(), args.end(), back_inserter(_source_files));
+  for (Args::const_iterator ai = args.begin();
+       ai != args.end();
+       ++ai) {
+    _source_files.push_back(Filename::from_os_specific(*ai));
+  }
   return true;
 }
 
diff --git a/pandatool/src/cvscopy/cvsCopy.h b/pandatool/src/cvscopy/cvsCopy.h
index f5e3b5a9af..ccae829413 100644
--- a/pandatool/src/cvscopy/cvsCopy.h
+++ b/pandatool/src/cvscopy/cvsCopy.h
@@ -25,6 +25,7 @@
 
 #include "programBase.h"
 #include "filename.h"
+#include "pvector.h"
 
 ////////////////////////////////////////////////////////////////////
 //       Class : CVSCopy
@@ -81,7 +82,7 @@ protected:
   string _cvs_binary;
   bool _user_aborted;
 
-  typedef vector_string SourceFiles;
+  typedef pvector<Filename> SourceFiles;
   SourceFiles _source_files;
 
   CVSSourceTree _tree;