diff --git a/ChangeLog b/ChangeLog
index e5917c551c2..234f2921cd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-30  Krister Walfridsson  <cato@df.lth.se>
+
+	* MAINTAINERS (OS Port Maintainers): Add myself as NetBSD maintainer.
+	(Write After Approval): Remove myself.
+
 2007-08-29  Nick Clifton  <nickc@redhat.com>
 
 	* config.sub, config.guess: Update from upstream sources.
diff --git a/MAINTAINERS b/MAINTAINERS
index 28c6fb9f5f0..c853876be7d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -105,6 +105,7 @@ hpux			Dave Anglin		dave.anglin@nrc.ca
 hpux			Steve Ellcey		sje@cup.hp.com
 irix, osf		Rainer Orth		ro@TechFak.Uni-Bielefeld.DE
 netbsd			Jason Thorpe		thorpej@netbsd.org
+netbsd			Krister Walfridsson	cato@df.lth.se
 sco5, unixware, sco udk	Kean Johnston		jkj@sco.com
 sh-linux-gnu		Kaz Kojima		kkojima@gcc.gnu.org
 RTEMS Ports		Joel Sherrill		joel@oarcorp.com
@@ -413,7 +414,6 @@ Caroline Tice					ctice@apple.com
 Michael Tiemann					tiemann@redhat.com
 David Ung					davidu@mips.com
 Jonathan Wakely					redi@gcc.gnu.org
-Krister Walfridsson				cato@df.lth.se
 Feng Wang					fengwang@nudt.edu.cn
 Stephen M. Webb					stephen.webb@bregmasoft.com
 John Wehle					john@feith.com