diff --git a/AUTHORS b/AUTHORS
index b915c7842..291ddc51b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,6 +18,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Johan Friis
   Steven de Brouwer
   Pietro Cerutti
+  Cory Donnelly
 
 Thanks to the following, who submitted detailed bug reports and excellent suggestions:
   Eugene Kramer
diff --git a/ChangeLog b/ChangeLog
index a4915eed0..f5a64adb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
    readable and preferred format with the "edit" command.
  + Fixed bug that caused a hang on cygwin, when a task with multiple
    annotations was edited (thanks to Joe Pulliam).
+ + Fixed bug #314 where the edit command fails when data.location includes
+   directories containing spaces (thanks to Cory Donnelly).
 
 ------ old releases ------------------------------
 
diff --git a/src/edit.cpp b/src/edit.cpp
index 48112538d..f8219e46d 100644
--- a/src/edit.cpp
+++ b/src/edit.cpp
@@ -543,7 +543,7 @@ void editFile (Task& task)
 
   // Complete the command line.
   editor += " ";
-  editor += file.str ();
+  editor += "\"" + file.str () + "\"";
 
 ARE_THESE_REALLY_HARMFUL:
   // Launch the editor.