6 files changed, 494 insertions, 240 deletions

diff --git a/games/q3server-osp/Makefile b/games/q3server-osp/Makefile
index bf0e2de462ea..41bc91cc99f8 100644
--- a/games/q3server-osp/Makefile
+++ b/games/q3server-osp/Makefile
@@ -6,9 +6,14 @@
 #
 
 PORTNAME=	osp
-PORTVERSION=	0.99w
-MASTER_SITES=	http://www.orangesmoothie.org/downloads/beta/
-DISTNAME=	${PORTNAME}-quake3-${PORTVERSION}
+PORTVERSION=	1.0
+MASTER_SITES=	http://mollusk.speakeasy.net/osp/ \
+		ftp://ftp.task.gda.pl/mirror/ftp.extreme-players.de/exp/q3/mod/osp/ \
+		http://ftp.gigabell.net/pub/exp/q3/mod/osp/ \
+		http://aoh-www.hhhr.ision.net/files/osp/ \
+		ftp://www.fragland.net/quake3/mods/ \
+		http://www.fleckz.com/files/
+DISTNAME=	${PORTNAME}-q3-FULL
 
 Q3_MOD_MASTER=	${.CURDIR}/../q3server-ra3
 
diff --git a/games/q3server-osp/distinfo b/games/q3server-osp/distinfo
index 14ddcf3cb471..1c77de73c9fe 100644
--- a/games/q3server-osp/distinfo
+++ b/games/q3server-osp/distinfo
@@ -1 +1 @@
-MD5 (osp-quake3-0.99w.zip) = 29cfed34da75f6b543239261d2643955
+MD5 (osp-q3-FULL.zip) = ac02dbb971190e77b979908a86b52303
diff --git a/games/q3server-osp/pkg-plist b/games/q3server-osp/pkg-plist
index 4aa90817ff1f..61765b5e58f9 100644
--- a/games/q3server-osp/pkg-plist
+++ b/games/q3server-osp/pkg-plist
@@ -1,123 +1,73 @@
 %%Q3DIR%%1v1.cfg
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/README-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ClientReadme-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Commands-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Decal-Editing-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Server-gfx-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Variables-CHN.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/INSTALL.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/OSP_Match_QuickStart.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/README.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/_CHINESE_TRANSLATIONS_
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ClientReadme.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Commands.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-DecalEditing.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Logging.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-MapConfigInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ModeInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-PlayerFilters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ServerGfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Variables.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Viewcam.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/CPM-info.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/README-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ClientReadme-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Commands-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Variables-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/Logging-OSP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/INSTALL-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/OSP Match Quick Start-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-ClientReadme-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Commands-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-README-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Variables-RUS.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/INSTALL.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/OSP Match Quick Start.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/README.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/_SPANISH_TRANSLATIONS_
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/filters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ClientReadme.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Commands.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ModeInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-PlayerFilters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ServerGfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Variables.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Viewcam.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-mapConfigInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/INSTALL.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/OSP Match Quick Start.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/README.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/_RUSSIAN_TRANSLATIONS_
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-ClientReadme.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Commands.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-PlayerFilters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-ServerGfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Variables.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Viewcam.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-ClientReadme.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Commands.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Decal-Editing.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-DecalEditing.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-History.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Logging.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Mode-info.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-MapConfigInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-ModeInfo.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-PlayerFilters.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Server-gfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-ServerGfx.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Variables.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Viewcam.txt
 %%PORTDOCS%%%%Q3DIR%%INSTALL.txt
+%%Q3DIR%%OSP Config Generator.exe
 %%Q3DIR%%OSP Match Quick Start.txt
 %%PORTDOCS%%%%Q3DIR%%README.txt
-%%Q3DIR%%altmodes/arena1v1.cfg
-%%Q3DIR%%altmodes/rail.cfg
-%%Q3DIR%%altmodes/railctf.cfg
-%%Q3DIR%%altmodes/railteam.cfg
-%%Q3DIR%%cfg-SinglePlayer/1v1.cfg
-%%Q3DIR%%cfg-SinglePlayer/clanarena.cfg
-%%Q3DIR%%cfg-SinglePlayer/ctf.cfg
-%%Q3DIR%%cfg-SinglePlayer/ffa.cfg
-%%Q3DIR%%cfg-SinglePlayer/instagib.cfg
-%%Q3DIR%%cfg-SinglePlayer/team.cfg
-%%Q3DIR%%cfg-custom/1v1.cfg
-%%Q3DIR%%cfg-custom/arena1v1.cfg
-%%Q3DIR%%cfg-custom/clanarena.cfg
-%%Q3DIR%%cfg-custom/ctf.cfg
-%%Q3DIR%%cfg-custom/ffa.cfg
-%%Q3DIR%%cfg-custom/rail.cfg
-%%Q3DIR%%cfg-custom/railctf.cfg
-%%Q3DIR%%cfg-custom/railteam.cfg
-%%Q3DIR%%cfg-custom/team.cfg
-%%Q3DIR%%cfg-gfxexample/gfxdef.cfg
-%%Q3DIR%%cfg-gfxexample/z-osp-misc.pk3
-%%Q3DIR%%cfg-maps/1v1arenamaps.txt
+%%Q3DIR%%VoodooStats-ReadME.txt
+%%Q3DIR%%cfg-DefaultModeReference/1v1.cfg
+%%Q3DIR%%cfg-DefaultModeReference/clanarena.cfg
+%%Q3DIR%%cfg-DefaultModeReference/ctf.cfg
+%%Q3DIR%%cfg-DefaultModeReference/ffa.cfg
+%%Q3DIR%%cfg-DefaultModeReference/qil.cfg
+%%Q3DIR%%cfg-DefaultModeReference/settings.txt
+%%Q3DIR%%cfg-DefaultModeReference/team.cfg
+%%Q3DIR%%cfg-GfxExample/gfxdef.cfg
+%%Q3DIR%%cfg-GfxExample/z-osp-misc.pk3
 %%Q3DIR%%cfg-maps/1v1maps.txt
-%%Q3DIR%%cfg-maps/Map_Config_Info.txt
-%%Q3DIR%%cfg-maps/caltdmmaps.txt
+%%Q3DIR%%cfg-maps/clanarenamaps.txt
 %%Q3DIR%%cfg-maps/ctfmaps.txt
 %%Q3DIR%%cfg-maps/ffamaps.txt
+%%Q3DIR%%cfg-maps/qilmaps.txt
 %%Q3DIR%%cfg-maps/teammaps.txt
-%%Q3DIR%%cfg-modes/instamodes-single.cfg
-%%Q3DIR%%cfg-modes/instamodes.cfg
-%%Q3DIR%%cfg-reference/1v1.cfg
-%%Q3DIR%%cfg-reference/clanarena.cfg
-%%Q3DIR%%cfg-reference/ctf.cfg
-%%Q3DIR%%cfg-reference/ffa.cfg
-%%Q3DIR%%cfg-reference/team.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-bal3dm4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-cpm1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-cpm1a.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-hub3tourney1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-japanctf.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-mrcq3t6_osp.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-overkill.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3dm13.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3dm6.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3tourney2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3tourney4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm10.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm11.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm12.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm13.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm14.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm15.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm16.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm17.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm19.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm5.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm6.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm7.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm8.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm9.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3jdm8a.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ospdm1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney4-broken.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney5.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp5.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp6.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp7.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp8.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wctf1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wctf2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wctf3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-ztn3dm1.cfg
 %%Q3DIR%%clanarena.cfg
 %%Q3DIR%%ctf-public.cfg
 %%Q3DIR%%ctf.cfg
@@ -127,24 +77,196 @@
 %%Q3DIR%%instagib.cfg
 %%Q3DIR%%locs/pro-q3dm6.cfg
 %%Q3DIR%%locs/q3dm6.cfg
-%%Q3DIR%%paks/z-osp-game099w.pk3
 %%Q3DIR%%spectool.cfg
 %%Q3DIR%%team.cfg
 %%Q3DIR%%vm/qagame.qvm
-%%Q3DIR%%z-osp-cgame099w.pk3
-%%Q3DIR%%z-osp-extra099w.pk3
-%%Q3DIR%%z-osp-players-099u.pk3
+%%Q3DIR%%voodoo/VoodooStats-ReadME.txt
+%%Q3DIR%%voodoo/c-default.cfg
+%%Q3DIR%%voodoo/c-footer.html
+%%Q3DIR%%voodoo/c-header.html
+%%Q3DIR%%voodoo/html/c-avalanche.css
+%%Q3DIR%%voodoo/html/c-esports.css
+%%Q3DIR%%voodoo/html/c-osp.css
+%%Q3DIR%%voodoo/html/c-voodoo.css
+%%Q3DIR%%voodoo/html/images/awards/1.jpg
+%%Q3DIR%%voodoo/html/images/awards/2.jpg
+%%Q3DIR%%voodoo/html/images/awards/3.jpg
+%%Q3DIR%%voodoo/html/images/awards/4.jpg
+%%Q3DIR%%voodoo/html/images/awards/5.jpg
+%%Q3DIR%%voodoo/html/images/awards/6.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_bfg.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_gauntlet.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_grenade.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_lightning.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_machine.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_nail.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_plasma.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_rail.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_rocket.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_shot.jpg
+%%Q3DIR%%voodoo/html/images/awards/blank.gif
+%%Q3DIR%%voodoo/html/images/awards/carnage_bfg.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_gauntlet.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_grapple.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_grenade.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_lightning.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_machine.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_nail.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_plasma.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_rail.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_rocket.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_shot.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_assists.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_caps.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_chaser.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_defense.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_escort.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_holder.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_haste.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_mega.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_quad.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_ra.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_regen.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_ya.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_accuracy.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_bloodlust.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_combat.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_damage.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_kills.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_voodoo.jpg
+%%Q3DIR%%voodoo/html/images/bg_blue.jpg
+%%Q3DIR%%voodoo/html/images/bg_blued.jpg
+%%Q3DIR%%voodoo/html/images/bg_neutral.jpg
+%%Q3DIR%%voodoo/html/images/bg_neutrald.jpg
+%%Q3DIR%%voodoo/html/images/bg_neutraldd.jpg
+%%Q3DIR%%voodoo/html/images/bg_red.jpg
+%%Q3DIR%%voodoo/html/images/bg_redd.jpg
+%%Q3DIR%%voodoo/html/images/break.gif
+%%Q3DIR%%voodoo/html/images/flag_cctf_blue.jpg
+%%Q3DIR%%voodoo/html/images/flag_cctf_red.jpg
+%%Q3DIR%%voodoo/html/images/flag_ctf_blue.jpg
+%%Q3DIR%%voodoo/html/images/flag_ctf_red.jpg
+%%Q3DIR%%voodoo/html/images/flag_ffa.gif
+%%Q3DIR%%voodoo/html/images/flag_tdm_blue.gif
+%%Q3DIR%%voodoo/html/images/flag_tdm_red.gif
+%%Q3DIR%%voodoo/html/images/logo-avl.gif
+%%Q3DIR%%voodoo/html/images/logo-osp.gif
+%%Q3DIR%%voodoo/html/images/logo-vp.gif
+%%Q3DIR%%voodoo/html/images/maps/dboxctf2a.jpg
+%%Q3DIR%%voodoo/html/images/maps/default.gif
+%%Q3DIR%%voodoo/html/images/maps/default.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospca1.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospctf1.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospctf2.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm1.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm10.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm11.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm12.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm2.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm3.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm4.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm5.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm6.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm7.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm8.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm9.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3dm13.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3dm6.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3tourney2.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3tourney4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm0.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm10.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm11.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm12.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm13.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm14.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm15.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm16.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm17.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm18.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm19.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm9.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3start.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3start08.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3start16.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney6_ctf.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp10.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp11.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp12.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp13.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp14.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp15.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp16.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp9.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wctf1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wctf2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wctf3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wxs1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wxs2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wxs3.jpg
+%%Q3DIR%%voodoo/html/images/maps/wnoise.jpg
+%%Q3DIR%%voodoo/log-backup/log-backup
+%%Q3DIR%%voodoo/server/voodoostats40-linux-OSP.zip
+%%Q3DIR%%voodoo/server/voodoostats40-win32-OSP.zip
+%%Q3DIR%%voodoo/voodoostats40-c.bat
+%%Q3DIR%%voodoo/voodoostats40-c.exe
+%%Q3DIR%%voodoo/vs-preparse.exe
+%%Q3DIR%%zz-osp-pak0.pk3
+%%Q3DIR%%zz-osp-server0.pk3
+@dirrm %%Q3DIR%%voodoo/server
+@dirrm %%Q3DIR%%voodoo/log-backup
+@dirrm %%Q3DIR%%voodoo/html/images/maps
+@dirrm %%Q3DIR%%voodoo/html/images/awards
+@dirrm %%Q3DIR%%voodoo/html/images
+@dirrm %%Q3DIR%%voodoo/html
+@dirrm %%Q3DIR%%voodoo
 @dirrm %%Q3DIR%%vm
-@dirrm %%Q3DIR%%paks
 @dirrm %%Q3DIR%%locs
-@dirrm %%Q3DIR%%cfg-viewcam
-@dirrm %%Q3DIR%%cfg-reference
-@dirrm %%Q3DIR%%cfg-modes
 @dirrm %%Q3DIR%%cfg-maps
-@dirrm %%Q3DIR%%cfg-gfxexample
-@dirrm %%Q3DIR%%cfg-custom
-@dirrm %%Q3DIR%%cfg-SinglePlayer
-@dirrm %%Q3DIR%%altmodes
+@dirrm %%Q3DIR%%cfg-GfxExample
+@dirrm %%Q3DIR%%cfg-DefaultModeReference
 %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/RUS
 %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/ESP
 %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/CHN
diff --git a/games/quake3-osp/Makefile b/games/quake3-osp/Makefile
index bf0e2de462ea..41bc91cc99f8 100644
--- a/games/quake3-osp/Makefile
+++ b/games/quake3-osp/Makefile
@@ -6,9 +6,14 @@
 #
 
 PORTNAME=	osp
-PORTVERSION=	0.99w
-MASTER_SITES=	http://www.orangesmoothie.org/downloads/beta/
-DISTNAME=	${PORTNAME}-quake3-${PORTVERSION}
+PORTVERSION=	1.0
+MASTER_SITES=	http://mollusk.speakeasy.net/osp/ \
+		ftp://ftp.task.gda.pl/mirror/ftp.extreme-players.de/exp/q3/mod/osp/ \
+		http://ftp.gigabell.net/pub/exp/q3/mod/osp/ \
+		http://aoh-www.hhhr.ision.net/files/osp/ \
+		ftp://www.fragland.net/quake3/mods/ \
+		http://www.fleckz.com/files/
+DISTNAME=	${PORTNAME}-q3-FULL
 
 Q3_MOD_MASTER=	${.CURDIR}/../q3server-ra3
 
diff --git a/games/quake3-osp/distinfo b/games/quake3-osp/distinfo
index 14ddcf3cb471..1c77de73c9fe 100644
--- a/games/quake3-osp/distinfo
+++ b/games/quake3-osp/distinfo
@@ -1 +1 @@
-MD5 (osp-quake3-0.99w.zip) = 29cfed34da75f6b543239261d2643955
+MD5 (osp-q3-FULL.zip) = ac02dbb971190e77b979908a86b52303
diff --git a/games/quake3-osp/pkg-plist b/games/quake3-osp/pkg-plist
index 4aa90817ff1f..61765b5e58f9 100644
--- a/games/quake3-osp/pkg-plist
+++ b/games/quake3-osp/pkg-plist
@@ -1,123 +1,73 @@
 %%Q3DIR%%1v1.cfg
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/README-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ClientReadme-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Commands-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Decal-Editing-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Server-gfx-CHN.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Variables-CHN.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/INSTALL.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/OSP_Match_QuickStart.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/README.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/_CHINESE_TRANSLATIONS_
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ClientReadme.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Commands.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-DecalEditing.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Logging.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-MapConfigInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ModeInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-PlayerFilters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-ServerGfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Variables.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/CHN/osp-q3-Viewcam.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/CPM-info.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/README-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ClientReadme-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Commands-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Variables-ESP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/Logging-OSP.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/INSTALL-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/OSP Match Quick Start-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-ClientReadme-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Commands-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-README-RUS.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Variables-RUS.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/INSTALL.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/OSP Match Quick Start.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/README.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/_SPANISH_TRANSLATIONS_
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/filters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ClientReadme.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Commands.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ModeInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-PlayerFilters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-ServerGfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Variables.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-Viewcam.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/ESP/osp-q3-mapConfigInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/INSTALL.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/OSP Match Quick Start.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/README.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/_RUSSIAN_TRANSLATIONS_
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-ClientReadme.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Commands.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-PlayerFilters.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-ServerGfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Variables.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/RUS/osp-q3-Viewcam.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-ClientReadme.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Commands.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Decal-Editing.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-DecalEditing.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-History.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Logging.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Mode-info.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-MapConfigInfo.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-ModeInfo.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-PlayerFilters.txt
-%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Server-gfx.txt
+%%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-ServerGfx.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Variables.txt
 %%PORTDOCS%%%%Q3DIR%%Docs/osp-q3-Viewcam.txt
 %%PORTDOCS%%%%Q3DIR%%INSTALL.txt
+%%Q3DIR%%OSP Config Generator.exe
 %%Q3DIR%%OSP Match Quick Start.txt
 %%PORTDOCS%%%%Q3DIR%%README.txt
-%%Q3DIR%%altmodes/arena1v1.cfg
-%%Q3DIR%%altmodes/rail.cfg
-%%Q3DIR%%altmodes/railctf.cfg
-%%Q3DIR%%altmodes/railteam.cfg
-%%Q3DIR%%cfg-SinglePlayer/1v1.cfg
-%%Q3DIR%%cfg-SinglePlayer/clanarena.cfg
-%%Q3DIR%%cfg-SinglePlayer/ctf.cfg
-%%Q3DIR%%cfg-SinglePlayer/ffa.cfg
-%%Q3DIR%%cfg-SinglePlayer/instagib.cfg
-%%Q3DIR%%cfg-SinglePlayer/team.cfg
-%%Q3DIR%%cfg-custom/1v1.cfg
-%%Q3DIR%%cfg-custom/arena1v1.cfg
-%%Q3DIR%%cfg-custom/clanarena.cfg
-%%Q3DIR%%cfg-custom/ctf.cfg
-%%Q3DIR%%cfg-custom/ffa.cfg
-%%Q3DIR%%cfg-custom/rail.cfg
-%%Q3DIR%%cfg-custom/railctf.cfg
-%%Q3DIR%%cfg-custom/railteam.cfg
-%%Q3DIR%%cfg-custom/team.cfg
-%%Q3DIR%%cfg-gfxexample/gfxdef.cfg
-%%Q3DIR%%cfg-gfxexample/z-osp-misc.pk3
-%%Q3DIR%%cfg-maps/1v1arenamaps.txt
+%%Q3DIR%%VoodooStats-ReadME.txt
+%%Q3DIR%%cfg-DefaultModeReference/1v1.cfg
+%%Q3DIR%%cfg-DefaultModeReference/clanarena.cfg
+%%Q3DIR%%cfg-DefaultModeReference/ctf.cfg
+%%Q3DIR%%cfg-DefaultModeReference/ffa.cfg
+%%Q3DIR%%cfg-DefaultModeReference/qil.cfg
+%%Q3DIR%%cfg-DefaultModeReference/settings.txt
+%%Q3DIR%%cfg-DefaultModeReference/team.cfg
+%%Q3DIR%%cfg-GfxExample/gfxdef.cfg
+%%Q3DIR%%cfg-GfxExample/z-osp-misc.pk3
 %%Q3DIR%%cfg-maps/1v1maps.txt
-%%Q3DIR%%cfg-maps/Map_Config_Info.txt
-%%Q3DIR%%cfg-maps/caltdmmaps.txt
+%%Q3DIR%%cfg-maps/clanarenamaps.txt
 %%Q3DIR%%cfg-maps/ctfmaps.txt
 %%Q3DIR%%cfg-maps/ffamaps.txt
+%%Q3DIR%%cfg-maps/qilmaps.txt
 %%Q3DIR%%cfg-maps/teammaps.txt
-%%Q3DIR%%cfg-modes/instamodes-single.cfg
-%%Q3DIR%%cfg-modes/instamodes.cfg
-%%Q3DIR%%cfg-reference/1v1.cfg
-%%Q3DIR%%cfg-reference/clanarena.cfg
-%%Q3DIR%%cfg-reference/ctf.cfg
-%%Q3DIR%%cfg-reference/ffa.cfg
-%%Q3DIR%%cfg-reference/team.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-bal3dm4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-cpm1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-cpm1a.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-hub3tourney1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-japanctf.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-mrcq3t6_osp.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-overkill.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3dm13.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3dm6.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3tourney2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-pro-q3tourney4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ctf4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm10.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm11.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm12.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm13.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm14.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm15.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm16.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm17.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm19.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm5.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm6.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm7.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm8.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3dm9.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3jdm8a.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3ospdm1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney4-broken.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3tourney5.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp4.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp5.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp6.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp7.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wcp8.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wctf1.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wctf2.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-q3wctf3.cfg
-%%Q3DIR%%cfg-viewcam/viewcam-ztn3dm1.cfg
 %%Q3DIR%%clanarena.cfg
 %%Q3DIR%%ctf-public.cfg
 %%Q3DIR%%ctf.cfg
@@ -127,24 +77,196 @@
 %%Q3DIR%%instagib.cfg
 %%Q3DIR%%locs/pro-q3dm6.cfg
 %%Q3DIR%%locs/q3dm6.cfg
-%%Q3DIR%%paks/z-osp-game099w.pk3
 %%Q3DIR%%spectool.cfg
 %%Q3DIR%%team.cfg
 %%Q3DIR%%vm/qagame.qvm
-%%Q3DIR%%z-osp-cgame099w.pk3
-%%Q3DIR%%z-osp-extra099w.pk3
-%%Q3DIR%%z-osp-players-099u.pk3
+%%Q3DIR%%voodoo/VoodooStats-ReadME.txt
+%%Q3DIR%%voodoo/c-default.cfg
+%%Q3DIR%%voodoo/c-footer.html
+%%Q3DIR%%voodoo/c-header.html
+%%Q3DIR%%voodoo/html/c-avalanche.css
+%%Q3DIR%%voodoo/html/c-esports.css
+%%Q3DIR%%voodoo/html/c-osp.css
+%%Q3DIR%%voodoo/html/c-voodoo.css
+%%Q3DIR%%voodoo/html/images/awards/1.jpg
+%%Q3DIR%%voodoo/html/images/awards/2.jpg
+%%Q3DIR%%voodoo/html/images/awards/3.jpg
+%%Q3DIR%%voodoo/html/images/awards/4.jpg
+%%Q3DIR%%voodoo/html/images/awards/5.jpg
+%%Q3DIR%%voodoo/html/images/awards/6.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_bfg.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_gauntlet.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_grenade.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_lightning.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_machine.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_nail.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_plasma.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_rail.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_rocket.jpg
+%%Q3DIR%%voodoo/html/images/awards/accuracy_shot.jpg
+%%Q3DIR%%voodoo/html/images/awards/blank.gif
+%%Q3DIR%%voodoo/html/images/awards/carnage_bfg.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_gauntlet.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_grapple.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_grenade.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_lightning.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_machine.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_nail.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_plasma.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_rail.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_rocket.jpg
+%%Q3DIR%%voodoo/html/images/awards/carnage_shot.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_assists.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_caps.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_chaser.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_defense.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_escort.jpg
+%%Q3DIR%%voodoo/html/images/awards/ctf_holder.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_haste.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_mega.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_quad.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_ra.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_regen.jpg
+%%Q3DIR%%voodoo/html/images/awards/item_ya.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_accuracy.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_bloodlust.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_combat.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_damage.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_kills.jpg
+%%Q3DIR%%voodoo/html/images/awards/player_voodoo.jpg
+%%Q3DIR%%voodoo/html/images/bg_blue.jpg
+%%Q3DIR%%voodoo/html/images/bg_blued.jpg
+%%Q3DIR%%voodoo/html/images/bg_neutral.jpg
+%%Q3DIR%%voodoo/html/images/bg_neutrald.jpg
+%%Q3DIR%%voodoo/html/images/bg_neutraldd.jpg
+%%Q3DIR%%voodoo/html/images/bg_red.jpg
+%%Q3DIR%%voodoo/html/images/bg_redd.jpg
+%%Q3DIR%%voodoo/html/images/break.gif
+%%Q3DIR%%voodoo/html/images/flag_cctf_blue.jpg
+%%Q3DIR%%voodoo/html/images/flag_cctf_red.jpg
+%%Q3DIR%%voodoo/html/images/flag_ctf_blue.jpg
+%%Q3DIR%%voodoo/html/images/flag_ctf_red.jpg
+%%Q3DIR%%voodoo/html/images/flag_ffa.gif
+%%Q3DIR%%voodoo/html/images/flag_tdm_blue.gif
+%%Q3DIR%%voodoo/html/images/flag_tdm_red.gif
+%%Q3DIR%%voodoo/html/images/logo-avl.gif
+%%Q3DIR%%voodoo/html/images/logo-osp.gif
+%%Q3DIR%%voodoo/html/images/logo-vp.gif
+%%Q3DIR%%voodoo/html/images/maps/dboxctf2a.jpg
+%%Q3DIR%%voodoo/html/images/maps/default.gif
+%%Q3DIR%%voodoo/html/images/maps/default.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospca1.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospctf1.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospctf2.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm1.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm10.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm11.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm12.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm2.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm3.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm4.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm5.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm6.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm7.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm8.jpg
+%%Q3DIR%%voodoo/html/images/maps/ospdm9.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3dm13.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3dm6.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3tourney2.jpg
+%%Q3DIR%%voodoo/html/images/maps/pro-q3tourney4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3ctf4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm0.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm10.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm11.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm12.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm13.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm14.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm15.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm16.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm17.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm18.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm19.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3dm9.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3start.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3start08.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3start16.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3tourney6_ctf.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3w8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wc8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp10.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp11.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp12.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp13.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp14.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp15.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp16.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp4.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp5.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp6.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp7.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp8.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wcp9.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wctf1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wctf2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wctf3.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wxs1.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wxs2.jpg
+%%Q3DIR%%voodoo/html/images/maps/q3wxs3.jpg
+%%Q3DIR%%voodoo/html/images/maps/wnoise.jpg
+%%Q3DIR%%voodoo/log-backup/log-backup
+%%Q3DIR%%voodoo/server/voodoostats40-linux-OSP.zip
+%%Q3DIR%%voodoo/server/voodoostats40-win32-OSP.zip
+%%Q3DIR%%voodoo/voodoostats40-c.bat
+%%Q3DIR%%voodoo/voodoostats40-c.exe
+%%Q3DIR%%voodoo/vs-preparse.exe
+%%Q3DIR%%zz-osp-pak0.pk3
+%%Q3DIR%%zz-osp-server0.pk3
+@dirrm %%Q3DIR%%voodoo/server
+@dirrm %%Q3DIR%%voodoo/log-backup
+@dirrm %%Q3DIR%%voodoo/html/images/maps
+@dirrm %%Q3DIR%%voodoo/html/images/awards
+@dirrm %%Q3DIR%%voodoo/html/images
+@dirrm %%Q3DIR%%voodoo/html
+@dirrm %%Q3DIR%%voodoo
 @dirrm %%Q3DIR%%vm
-@dirrm %%Q3DIR%%paks
 @dirrm %%Q3DIR%%locs
-@dirrm %%Q3DIR%%cfg-viewcam
-@dirrm %%Q3DIR%%cfg-reference
-@dirrm %%Q3DIR%%cfg-modes
 @dirrm %%Q3DIR%%cfg-maps
-@dirrm %%Q3DIR%%cfg-gfxexample
-@dirrm %%Q3DIR%%cfg-custom
-@dirrm %%Q3DIR%%cfg-SinglePlayer
-@dirrm %%Q3DIR%%altmodes
+@dirrm %%Q3DIR%%cfg-GfxExample
+@dirrm %%Q3DIR%%cfg-DefaultModeReference
 %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/RUS
 %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/ESP
 %%PORTDOCS%%@dirrm %%Q3DIR%%Docs/CHN