diff --git a/ChangeLog b/ChangeLog
index 5eb24061..72898640 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-05  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* avrdude.1: Remove the note that users might edit the system-wide
+	config file.  This file will be overwritten by the next
+	installation, so it's not a good idea to manually modify it.
+	Using the -C +file option is a much better way for user
+	modifications.
+	* doc/avrdude.texi: (Dito.)
+
 2014-03-13  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* configure.ac (AC_INIT): Bump version for post-6.1.
diff --git a/avrdude.1 b/avrdude.1
index b730bc6d..7bda0275 100644
--- a/avrdude.1
+++ b/avrdude.1
@@ -231,12 +231,7 @@ need to be specified to
 .It Fl p Ar partno
 This is the only option that is mandatory for every invocation of
 .Nm avrdude .
-It specifies the type of the MCU connected to the programmer.  These are read from the config file.  If
-.Nm avrdude
-does not know about a part that you have, simply add it to the config
-file (be sure and submit a patch back to the author so that it can be
-incorporated for the next version).  See the sample config file for
-the format. 
+It specifies the type of the MCU connected to the programmer.  These are read from the config file.
 For currently supported MCU types use ? as partno, this will print a list of partno ids and official part names on the terminal. (Both can be used with the -p option.)
 .Pp
 Following parts need special attention:
diff --git a/doc/avrdude.texi b/doc/avrdude.texi
index 08232f9f..e3816647 100644
--- a/doc/avrdude.texi
+++ b/doc/avrdude.texi
@@ -385,9 +385,7 @@ Currently, the following programmer ids are understood and supported:
 @item -C @var{config-file}
 Use the specified config file for configuration data.  This file
 contains all programmer and part definitions that AVRDUDE knows about.
-If you have a programmer or part that AVRDUDE does not know about, you
-can add it to the config file (be sure and submit a patch back to the
-author so that it can be incorporated for the next version).  If not
+If not
 specified, AVRDUDE reads the configuration file from
 /usr/local/etc/avrdude.conf (FreeBSD and Linux). See Appendix A for
 the method of searching for the configuration file for Windows.