diff --git a/ChangeLog b/ChangeLog
index 39e15d200756187ec6500fa3dafa9c429802b14b..58f52c1711526bbb27d4c7db406722a4b08c563f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-22  Andreas Tobler  <andreast@gcc.gnu.org>
+
+	* MAINTAINERS (OS Port Maintainers): Add myself.
+	(Various Maintainers): Remove myself from libffi testsuite.
+
 2015-06-04  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* MAINTAINERS (gen* on machine desc): Add self.
diff --git a/MAINTAINERS b/MAINTAINERS
index 0557ce86fba86c2365858570d6b56ffc55e6cde9..1d37477a8a8d720365cfa09a85ea2a081bd7c4d0 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -125,7 +125,7 @@ Android sub-port	Maxim Kuvyrkov		<maxim.kuvyrkov@linaro.org>
 darwin port		Mike Stump		<mikestump@comcast.net>
 darwin port		Eric Christopher	<echristo@gmail.com>
 DJGPP			DJ Delorie		<dj@delorie.com>
-freebsd			Loren J. Rittle		<ljrittle@acm.org>
+freebsd			Andreas Tobler		<andreast@gcc.gnu.org>
 GNU/Hurd		Thomas Schwinge		<thomas@schwinge.name>
 hpux			John David Anglin	<dave.anglin@bell.net>
 hpux			Steve Ellcey		<sellcey@mips.com>
@@ -175,7 +175,6 @@ libgomp			Jakub Jelinek		<jakub@redhat.com>
 libiberty		DJ Delorie		<dj@redhat.com>
 libiberty		Ian Lance Taylor	<ian@airs.com>
 libitm			Torvald Riegel		<triegel@redhat.com>
-libffi testsuite	Andreas Tobler		<andreast@gcc.gnu.org>
 libmpx			Ilya Enkovich		<enkovich.gnu@gmail.com>
 libobjc			Nicola Pero		<nicola.pero@meta-innovation.com>
 libobjc			Andrew Pinski		<pinskia@gmail.com>