diff --git a/share/misc/organization.dot b/share/misc/organization.dot
index aab39c96ea7..d888ff420b1 100644
--- a/share/misc/organization.dot
+++ b/share/misc/organization.dot
@@ -31,11 +31,11 @@ doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"]
 doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nbcr, gabor, gjb, hrs,\nblackend, ryusuke, wblock"]
 pkgmgr [label="Package Management Team\npkgmgr@FreeBSD.org\nantoine, bdrewery"]
 portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"]
-portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat, pizzamig\nrene, swills, tcberner"]
+portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nbapt, bofh, mat\npizzamig, rene, tcberner"]
 portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nrene"]
 re [label="Primary Release Engineering Team\nre@FreeBSD.org\ngjb, kib\n, blackend, delphij, cperciva"]
 secteam [label="Security Team\nsecteam@FreeBSD.org\ndelphij,\ndes, markj,\nemaste,\ngjb, gordon,\noshogbo, philip"]
-portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, jgh, rea, riggs, sbz, simon, swills, zi"]
+portssecteam [label="Ports Security Team\nports-secteam@FreeBSD.org\ndelphij, amdmi3, eadler, jgh, rea, riggs, sbz, simon, zi"]
 secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"]
 securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\nbenno, delphij,\ndes, emaste,\ngjb, gordon,\nremko"]
 srccommitters [label="Src Committers\nsrc-committers@FreeBSD.org"]