diff --git a/ChangeLog b/ChangeLog
index 4024b5bee..4133c1fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* HACKING: added advice for using g_strdup for a modifiable
 	copy of a string.
+	* HACKING: added a section about where to look for bug reports
+	and patches.
 
 2004-09-19  Roland Illig  <roland.illig@gmx.de>
 
diff --git a/HACKING b/HACKING
index c9f88ac8f..c41e038a9 100644
--- a/HACKING
+++ b/HACKING
@@ -277,7 +277,36 @@ provide a callback function.  Please note that it's not the same as the
 user callback in some widgets.
 
 
-PROGRAMMING TIPS
+Where to Find Bug Reports and Patches
+=====================================
+
+There are various sources where bug reports and patches can be found.
+
+http://savannah.gnu.org/bugs/?group=mc
+	The primary bug tracking system for MC.
+
+http://bugs.debian.org/mc
+	The bug tracking system for Debian, a package collection mainly
+	for GNU/Linux and the Hurd.
+
+
+http://savannah.gnu.org/patch/?group=mc
+	Patches reported in the GNU Savannah project.
+
+http://www.openbsd.org/cgi-bin/cvsweb/ports/misc/mc/patches/
+	The patches that are applied for the OpenBSD version of MC.
+
+http://www.freebsd.org/cgi/cvsweb.cgi/ports/misc/mc/files/
+	The patches that are applied for the FreeBSD version of MC.
+
+http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/sysutils/mc/patches/
+	The patches that are applied for the NetBSD version of MC.
+
+http://www.gentoo.org/cgi-bin/viewcvs.cgi/app-misc/mc/files/?hideattic=1
+	The patches that are applied for the Gentoo Linux version of MC.
+
+
+Programming Tips
 ================
 
 (This list should be sorted alphabetically.)