diff --git a/en_US.ISO8859-1/articles/building-products/Makefile b/en_US.ISO8859-1/articles/building-products/Makefile
index beae7b5352..7ca6b11b43 100644
--- a/en_US.ISO8859-1/articles/building-products/Makefile
+++ b/en_US.ISO8859-1/articles/building-products/Makefile
@@ -12,7 +12,7 @@ INSTALL_ONLY_COMPRESSED?=
 
 SRCS=			article.sgml
 
-IMAGES_EN=		freebsd-branches.eps
+IMAGES_EN=		freebsd-branches.pic freebsd-organization.pic
 
 URL_RELPREFIX?=	../../../..
 DOC_PREFIX?= ${.CURDIR}/../../..
diff --git a/en_US.ISO8859-1/articles/building-products/article.sgml b/en_US.ISO8859-1/articles/building-products/article.sgml
index b7c0b13f35..6db6b84c53 100644
--- a/en_US.ISO8859-1/articles/building-products/article.sgml
+++ b/en_US.ISO8859-1/articles/building-products/article.sgml
@@ -373,6 +373,15 @@
         additional responsibilities, and new committers are assigned
         mentors to help them learn the ropes.</para>
 
+      <figure>
+        <title>FreeBSD Organization</title>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="freebsd-organization" format="PIC">
+          </imageobject>
+        </mediaobject>
+      </figure>
+
       <para>Conflict resolution is performed by a nine member
         <quote>Core Team</quote> that is elected from the group of
         committers.</para>
diff --git a/share/images/articles/building-products/freebsd-branches.eps b/share/images/articles/building-products/freebsd-branches.eps
deleted file mode 100644
index 73e02ec415..0000000000
--- a/share/images/articles/building-products/freebsd-branches.eps
+++ /dev/null
@@ -1,262 +0,0 @@
-%!PS-Adobe-2.0 EPSF-2.0
-%%Title: freebsd-branches.fig
-%%Creator: fig2dev Version 3.2 Patchlevel 4
-%%CreationDate: Wed Nov  9 20:55:25 2005
-%%For: koshy@orthanc (Joseph Koshy)
-%%BoundingBox: 0 0 351 169
-%%Magnification: 1.0000
-%%EndComments
-/$F2psDict 200 dict def
-$F2psDict begin
-$F2psDict /mtrx matrix put
-/col-1 {0 setgray} bind def
-/col0 {0.000 0.000 0.000 srgb} bind def
-/col1 {0.000 0.000 1.000 srgb} bind def
-/col2 {0.000 1.000 0.000 srgb} bind def
-/col3 {0.000 1.000 1.000 srgb} bind def
-/col4 {1.000 0.000 0.000 srgb} bind def
-/col5 {1.000 0.000 1.000 srgb} bind def
-/col6 {1.000 1.000 0.000 srgb} bind def
-/col7 {1.000 1.000 1.000 srgb} bind def
-/col8 {0.000 0.000 0.560 srgb} bind def
-/col9 {0.000 0.000 0.690 srgb} bind def
-/col10 {0.000 0.000 0.820 srgb} bind def
-/col11 {0.530 0.810 1.000 srgb} bind def
-/col12 {0.000 0.560 0.000 srgb} bind def
-/col13 {0.000 0.690 0.000 srgb} bind def
-/col14 {0.000 0.820 0.000 srgb} bind def
-/col15 {0.000 0.560 0.560 srgb} bind def
-/col16 {0.000 0.690 0.690 srgb} bind def
-/col17 {0.000 0.820 0.820 srgb} bind def
-/col18 {0.560 0.000 0.000 srgb} bind def
-/col19 {0.690 0.000 0.000 srgb} bind def
-/col20 {0.820 0.000 0.000 srgb} bind def
-/col21 {0.560 0.000 0.560 srgb} bind def
-/col22 {0.690 0.000 0.690 srgb} bind def
-/col23 {0.820 0.000 0.820 srgb} bind def
-/col24 {0.500 0.190 0.000 srgb} bind def
-/col25 {0.630 0.250 0.000 srgb} bind def
-/col26 {0.750 0.380 0.000 srgb} bind def
-/col27 {1.000 0.500 0.500 srgb} bind def
-/col28 {1.000 0.630 0.630 srgb} bind def
-/col29 {1.000 0.750 0.750 srgb} bind def
-/col30 {1.000 0.880 0.880 srgb} bind def
-/col31 {1.000 0.840 0.000 srgb} bind def
-
-end
-save
-newpath 0 169 moveto 0 0 lineto 351 0 lineto 351 169 lineto closepath clip newpath
--13.5 183.6 translate
-1 -1 scale
-
-/cp {closepath} bind def
-/ef {eofill} bind def
-/gr {grestore} bind def
-/gs {gsave} bind def
-/sa {save} bind def
-/rs {restore} bind def
-/l {lineto} bind def
-/m {moveto} bind def
-/rm {rmoveto} bind def
-/n {newpath} bind def
-/s {stroke} bind def
-/sh {show} bind def
-/slc {setlinecap} bind def
-/slj {setlinejoin} bind def
-/slw {setlinewidth} bind def
-/srgb {setrgbcolor} bind def
-/rot {rotate} bind def
-/sc {scale} bind def
-/sd {setdash} bind def
-/ff {findfont} bind def
-/sf {setfont} bind def
-/scf {scalefont} bind def
-/sw {stringwidth} bind def
-/tr {translate} bind def
-/tnt {dup dup currentrgbcolor
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add
-  4 -2 roll dup 1 exch sub 3 -1 roll mul add srgb}
-  bind def
-/shd {dup dup currentrgbcolor 4 -2 roll mul 4 -2 roll mul
-  4 -2 roll mul srgb} bind def
-/reencdict 12 dict def /ReEncode { reencdict begin
-/newcodesandnames exch def /newfontname exch def /basefontname exch def
-/basefontdict basefontname findfont def /newfont basefontdict maxlength dict def
-basefontdict { exch dup /FID ne { dup /Encoding eq
-{ exch dup length array copy newfont 3 1 roll put }
-{ exch newfont 3 1 roll put } ifelse } { pop pop } ifelse } forall
-newfont /FontName newfontname put newcodesandnames aload pop
-128 1 255 { newfont /Encoding get exch /.notdef put } for
-newcodesandnames length 2 idiv { newfont /Encoding get 3 1 roll put } repeat
-newfontname newfont definefont pop end } def
-/isovec [
-8#055 /minus 8#200 /grave 8#201 /acute 8#202 /circumflex 8#203 /tilde
-8#204 /macron 8#205 /breve 8#206 /dotaccent 8#207 /dieresis
-8#210 /ring 8#211 /cedilla 8#212 /hungarumlaut 8#213 /ogonek 8#214 /caron
-8#220 /dotlessi 8#230 /oe 8#231 /OE
-8#240 /space 8#241 /exclamdown 8#242 /cent 8#243 /sterling
-8#244 /currency 8#245 /yen 8#246 /brokenbar 8#247 /section 8#250 /dieresis
-8#251 /copyright 8#252 /ordfeminine 8#253 /guillemotleft 8#254 /logicalnot
-8#255 /hyphen 8#256 /registered 8#257 /macron 8#260 /degree 8#261 /plusminus
-8#262 /twosuperior 8#263 /threesuperior 8#264 /acute 8#265 /mu 8#266 /paragraph
-8#267 /periodcentered 8#270 /cedilla 8#271 /onesuperior 8#272 /ordmasculine
-8#273 /guillemotright 8#274 /onequarter 8#275 /onehalf
-8#276 /threequarters 8#277 /questiondown 8#300 /Agrave 8#301 /Aacute
-8#302 /Acircumflex 8#303 /Atilde 8#304 /Adieresis 8#305 /Aring
-8#306 /AE 8#307 /Ccedilla 8#310 /Egrave 8#311 /Eacute
-8#312 /Ecircumflex 8#313 /Edieresis 8#314 /Igrave 8#315 /Iacute
-8#316 /Icircumflex 8#317 /Idieresis 8#320 /Eth 8#321 /Ntilde 8#322 /Ograve
-8#323 /Oacute 8#324 /Ocircumflex 8#325 /Otilde 8#326 /Odieresis 8#327 /multiply
-8#330 /Oslash 8#331 /Ugrave 8#332 /Uacute 8#333 /Ucircumflex
-8#334 /Udieresis 8#335 /Yacute 8#336 /Thorn 8#337 /germandbls 8#340 /agrave
-8#341 /aacute 8#342 /acircumflex 8#343 /atilde 8#344 /adieresis 8#345 /aring
-8#346 /ae 8#347 /ccedilla 8#350 /egrave 8#351 /eacute
-8#352 /ecircumflex 8#353 /edieresis 8#354 /igrave 8#355 /iacute
-8#356 /icircumflex 8#357 /idieresis 8#360 /eth 8#361 /ntilde 8#362 /ograve
-8#363 /oacute 8#364 /ocircumflex 8#365 /otilde 8#366 /odieresis 8#367 /divide
-8#370 /oslash 8#371 /ugrave 8#372 /uacute 8#373 /ucircumflex
-8#374 /udieresis 8#375 /yacute 8#376 /thorn 8#377 /ydieresis] def
-/Times-Bold /Times-Bold-iso isovec ReEncode
-/Helvetica-Oblique /Helvetica-Oblique-iso isovec ReEncode
-/Times-Roman /Times-Roman-iso isovec ReEncode
-/$F2psBegin {$F2psDict begin /$F2psEnteredState save def} def
-/$F2psEnd {$F2psEnteredState restore end} def
-
-$F2psBegin
-10 setmiterlimit
-0 slj 0 slc
- 0.06000 0.06000 sc
-%
-% Fig objects follow
-%
-% 
-% here starts figure with depth 50
-/Times-Roman-iso ff 180.00 scf sf
-3690 1860 m
-gs 1 -1 sc (6.0-REL) col13 sh gr
-% Polyline
-7.500 slw
-gs  clippath
-2460 1807 m 2507 1845 l 2601 1727 l 2503 1802 l 2554 1689 l cp
-eoclip
-n 2793 1440 m
- 2493 1815 l gs col0 s gr gr
-
-% arrowhead
-n 2554 1689 m 2503 1802 l 2601 1727 l 2554 1689 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-5161 2055 m 5207 2017 l 5112 1899 l 5165 2012 l 5066 1937 l cp
-eoclip
-n 4387 1050 m
- 5175 2025 l gs col0 s gr gr
-
-% arrowhead
-n 5066 1937 m 5165 2012 l 5112 1899 l 5066 1937 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-5715 1080 m 5715 1020 l 5564 1020 l 5684 1050 l 5564 1080 l cp
-eoclip
-n 300 1050 m
- 5700 1050 l gs col0 s gr gr
-
-% arrowhead
-n 5564 1080 m 5684 1050 l 5564 1020 l 5564 1080 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-1936 3030 m 1982 2992 l 1887 2874 l 1940 2987 l 1841 2912 l cp
-eoclip
-n 375 1050 m
- 1950 3000 l gs col0 s gr gr
-
-% arrowhead
-n 1841 2912 m 1940 2987 l 1887 2874 l 1841 2912 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-951 2550 m 998 2588 l 1092 2470 l 994 2545 l 1045 2432 l cp
-eoclip
-n 1284 2183 m
- 984 2558 l gs col0 s gr gr
-
-% arrowhead
-n 1045 2432 m 994 2545 l 1092 2470 l 1045 2432 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-417 1867 m 464 1905 l 558 1787 l 460 1862 l 511 1749 l cp
-eoclip
-n 750 1500 m
- 450 1875 l gs col0 s gr gr
-
-% arrowhead
-n 511 1749 m 460 1862 l 558 1787 l 511 1749 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-3285 2857 m 3332 2895 l 3426 2777 l 3328 2852 l 3379 2739 l cp
-eoclip
-n 3618 2490 m
- 3318 2865 l gs col0 s gr gr
-
-% arrowhead
-n 3379 2739 m 3328 2852 l 3426 2777 l 3379 2739 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-1326 2996 m 1373 3034 l 1467 2916 l 1369 2991 l 1420 2878 l cp
-eoclip
-n 1659 2629 m
- 1359 3004 l gs col0 s gr gr
-
-% arrowhead
-n 1420 2878 m 1369 2991 l 1467 2916 l 1420 2878 l  cp gs 0.00 setgray ef gr  col0 s
-% Polyline
-gs  clippath
-4304 1718 m 4351 1756 l 4445 1638 l 4347 1713 l 4398 1600 l cp
-eoclip
-n 4637 1351 m
- 4337 1726 l gs col0 s gr gr
-
-% arrowhead
-n 4398 1600 m 4347 1713 l 4445 1638 l 4398 1600 l  cp gs 0.00 setgray ef gr  col0 s
-/Times-Bold-iso ff 270.00 scf sf
-300 450 m
-gs 1 -1 sc (FreeBSD Release Branches) col12 sh gr
-/Helvetica-Oblique-iso ff 180.00 scf sf
-5100 1800 m
-gs 1 -1 sc (6-STABLE) col1 sh gr
-/Helvetica-Oblique-iso ff 180.00 scf sf
-5100 975 m
-gs 1 -1 sc (-CURRENT) col1 sh gr
-/Helvetica-Oblique-iso ff 180.00 scf sf
-3975 2700 m
-gs 1 -1 sc (5-STABLE) col1 sh gr
-/Helvetica-Oblique-iso ff 180.00 scf sf
-1725 2550 m
-gs 1 -1 sc (4-STABLE) col1 sh gr
-/Times-Roman-iso ff 180.00 scf sf
-570 3060 m
-gs 1 -1 sc (4.11-REL) col13 sh gr
-/Times-Roman-iso ff 180.00 scf sf
-225 2625 m
-gs 1 -1 sc (4.10-REL) col13 sh gr
-/Times-Roman-iso ff 180.00 scf sf
-285 1695 m
-gs 1 -1 sc (4.0) col13 sh gr
-/Times-Roman-iso ff 180.00 scf sf
-1815 1905 m
-gs 1 -1 sc (5.3-REL) col13 sh gr
-/Times-Roman-iso ff 180.00 scf sf
-2640 2880 m
-gs 1 -1 sc (5.4-REL) col13 sh gr
-% Polyline
-gs  clippath
-4036 3030 m 4082 2992 l 3987 2874 l 4040 2987 l 3941 2912 l cp
-eoclip
-n 2475 1050 m
- 4050 3000 l gs col0 s gr gr
-
-% arrowhead
-n 3941 2912 m 4040 2987 l 3987 2874 l 3941 2912 l  cp gs 0.00 setgray ef gr  col0 s
-% here ends figure;
-$F2psEnd
-rs
-showpage
diff --git a/share/images/articles/building-products/freebsd-branches.fig b/share/images/articles/building-products/freebsd-branches.fig
deleted file mode 100644
index 0d65883282..0000000000
--- a/share/images/articles/building-products/freebsd-branches.fig
+++ /dev/null
@@ -1,51 +0,0 @@
-#FIG 3.2
-# $FreeBSD$
-Landscape
-Center
-Inches
-Letter  
-100.00
-Single
--2
-1200 2
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 2475 1050 4050 3000
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 2793 1440 2493 1815
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 4387 1050 5175 2025
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 300 1050 5700 1050
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 375 1050 1950 3000
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 1284 2183 984 2558
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 750 1500 450 1875
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 3618 2490 3318 2865
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 1659 2629 1359 3004
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 7 1 0 2
-	1 1 1.00 60.00 120.00
-	 4637 1351 4337 1726
-4 0 12 50 -1 2 18 0.0000 4 195 3195 300 450 FreeBSD Release Branches\001
-4 0 1 50 -1 17 12 0.0000 4 135 885 5100 1800 6-STABLE\001
-4 0 1 50 -1 17 12 0.0000 4 135 945 5100 975 -CURRENT\001
-4 0 1 50 -1 17 12 0.0000 4 135 885 3975 2700 5-STABLE\001
-4 0 1 50 -1 17 12 0.0000 4 135 885 1725 2550 4-STABLE\001
-4 0 13 50 -1 0 12 0.0000 4 135 720 570 3060 4.11-REL\001
-4 0 13 50 -1 0 12 0.0000 4 135 720 225 2625 4.10-REL\001
-4 0 13 50 -1 0 12 0.0000 4 135 225 285 1695 4.0\001
-4 0 13 50 -1 0 12 0.0000 4 135 630 1815 1905 5.3-REL\001
-4 0 13 50 -1 0 12 0.0000 4 135 630 2640 2880 5.4-REL\001
-4 0 13 50 -1 0 12 0.0000 4 135 630 3690 1860 6.0-REL\001
diff --git a/share/images/articles/building-products/freebsd-branches.pic b/share/images/articles/building-products/freebsd-branches.pic
new file mode 100644
index 0000000000..eb56b4e79b
--- /dev/null
+++ b/share/images/articles/building-products/freebsd-branches.pic
@@ -0,0 +1,36 @@
+.\"
+.\" $FreeBSD$
+.\"
+.\" Release branch structure
+.\"
+.PS
+define majorrelarrow { arrow down .75 right .75 }
+define majorrelname  { box invisible "\f(HO$1\fP" outline "blue" with .c \
+   at last arrow .end + (.3,.15) }
+define minorrelarrow { arrow down .25 left .25 with .start at $2 \
+   <$1.start,$1.end>; box invisible "\fB$3\fP" outline "green4" with .c \
+   at last arrow .end + (-.15,.02) }
+right
+
+# Arrow for CVS HEAD
+H: arrow 4.5
+   box invisible "\f(HO-CURRENT\fP" outline "blue" with .c at last arrow .end + (0,.1)
+
+# Releng 4
+R4: majorrelarrow with .start at H .start + (.1,0)
+    majorrelname(4-STABLE)
+    minorrelarrow(R4,.1,4.0)
+    minorrelarrow(R4,.3,4.1)
+    minorrelarrow(R4,.66,4.11)
+    box invisible "..." at .45 <R4.start,R4.end> + (-.125,-.125)
+# Releng 5
+R5: majorrelarrow with .start at R4 .start + (1.75,0)
+    majorrelname(5-STABLE)
+    minorrelarrow(R5,.25,5.3)
+    minorrelarrow(R5,.66,5.4)
+
+# Releng 6
+R6: majorrelarrow with .start at R5 .start + (1.75,0)
+    majorrelname(6-STABLE)
+    minorrelarrow(R6,.25,6.0)
+.PE
\ No newline at end of file
diff --git a/share/images/articles/building-products/freebsd-organization.pic b/share/images/articles/building-products/freebsd-organization.pic
new file mode 100644
index 0000000000..c60dc8a0e1
--- /dev/null
+++ b/share/images/articles/building-products/freebsd-organization.pic
@@ -0,0 +1,36 @@
+.\"
+.\" $FreeBSD$
+.\"
+.\" A representation of the organizational structure of the FreeBSD project.
+.\"
+.PS
+define bold { "\fB\s+1$1\s0\fP" }
+define italic { "\fI\s+1$1\s0\fP" }
+define fixed { "\f(CW$1\fP" }
+# users
+U: ellipse width 4.5 height 2.75 shaded "pink"
+
+# committers
+C: ellipse width 3.75 height 1.80 shaded "sienna" with .c at U.c + \
+    (-.1,-.25)
+
+# core
+O: ellipse width .85 height .65 shaded "gold" with .c at C.c + (-1,-.15) \
+    bold(Core Team) bold( (9) );
+
+# "sources" box
+S: box width 1.1 height .9 shaded "green4" with .c at C.c + (.75,-.15);
+box same invisible bold(Source Trees) ljust fixed(src/ ports/) ljust \
+    fixed(doc/ www/) ljust with .c at S.w + (.1,0);
+
+# label the "user" and "committer" ellipses
+box invisible bold(FreeBSD Users) bold( (many) ) with .n at U .n + \
+    (-0.2,-.2);
+box invisible bold(FreeBSD Committers) bold( (340+) ) with .n at C .n + \
+    (-.4,-0.2);
+
+# draw the arrow representing 'contributions' to the source base
+down
+arrow 1 thickness 1.5 color "forestgreen" with .start at S.n + (0,1.05);
+box invisible with .w at last arrow .center + (.1,.1) italic(contributions);
+.PE
\ No newline at end of file