diff --git a/src/or/config.c b/src/or/config.c
index 34421406d6..481db2526a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3191,6 +3191,8 @@ validate_data_directory(or_options_t *options)
 
 #define GENERATED_FILE_PREFIX "# This file was generated by Tor; " \
   "if you edit it, comments will not be preserved"
+#define GENERATED_FILE_COMMENT "# If you want a config file with " \
+  "comments, look for torrc.orig.1 or similar"
 
 /** Save a configuration file for the configuration in <b>options</b>
  * into the file <b>fname</b>.  If the file already exists, and
@@ -3225,9 +3227,10 @@ write_configuration_file(const char *fname, or_options_t *options)
     goto err;
   }
 
-  len = strlen(new_conf)+128;
+  len = strlen(new_conf)+256;
   new_val = tor_malloc(len);
-  tor_snprintf(new_val, len, "%s\n\n%s", GENERATED_FILE_PREFIX, new_conf);
+  tor_snprintf(new_val, len, "%s\n%s\n\n%s",
+               GENERATED_FILE_PREFIX, GENERATED_FILE_COMMENTS, new_conf);
 
   if (rename_old) {
     int i = 1;