diff --git a/www/cherokee-devel/Makefile b/www/cherokee-devel/Makefile
index 789d3856cd12..8530466cb0e1 100644
--- a/www/cherokee-devel/Makefile
+++ b/www/cherokee-devel/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	cherokee
-DISTVERSION=	0.6.0b863
-PORTREVISION=	2
+DISTVERSION=	0.6.0
+PORTREVISION=	3
 CATEGORIES=	www
-MASTER_SITES=	http://www.cherokee-project.com/download/0.6/${PORTVERSION:R}/ \
-		CENKES LOCAL/beech
+MASTER_SITES=	http://www.cherokee-project.com/download/0.6/${DISTVERSION}/ \
+		LOCAL/beech
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	beech@FreeBSD.org
@@ -59,7 +59,6 @@ CONFIGURE_ARGS+=--disable-ipv6
 post-patch:
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
 		${REINPLACE_CMD} -e 's|@mkdir_p@|${MKDIR} --|g'
-	@${MV} ${WRKSRC}/mods-icons.conf.sample ${WRKSRC}/mods-icons.sample
 	@${REINPLACE_CMD} -e '/cherokee_replace.*%sysconfdir%/d;/^SUBDIRS/s|doc ||;\
 		/^install-data-am/s|install-data-local|install-data-local-config|;\
 		/^SUBDIRS/s|windows||'\
@@ -79,8 +78,6 @@ post-install:
 	@for i in ${DEFCONFS};do\
 		${INSTALL_DATA} ${WRKSRC}/$$i.sample ${PREFIX}/etc/cherokee/$$i.default;done
 	@${INSTALL_DATA} ${WRKSRC}/performance.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.perf_sample
-	@for i in ${WRKSRC}/mods-*.sample;do\
-		${INSTALL_DATA} $$i ${PREFIX}/etc/cherokee/mods-available/$${i#*mods-};done
 	@:>${PREFIX}/etc/cherokee/mods-enabled/.empty
 	@:>${PREFIX}/etc/cherokee/sites-available/.empty
 	@:>${PREFIX}/etc/cherokee/sites-enabled/.empty
diff --git a/www/cherokee-devel/distinfo b/www/cherokee-devel/distinfo
index 7966d29ac2db..1ea434a75e27 100644
--- a/www/cherokee-devel/distinfo
+++ b/www/cherokee-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (cherokee-0.6.0b863.tar.gz) = 55817de038d15fd59953bb0412968948
-SHA256 (cherokee-0.6.0b863.tar.gz) = 10d1b0da07fe687a9f6a2559af288d6110896075606406e09db922699c66a121
-SIZE (cherokee-0.6.0b863.tar.gz) = 1047063
+MD5 (cherokee-0.6.0.tar.gz) = f6eb7e847b50ebef5df45a3bc7df280c
+SHA256 (cherokee-0.6.0.tar.gz) = 58c13ffc71f2c3ed03cd258fba8d4b916310559aae2bdc89f57f4e609cf9e42c
+SIZE (cherokee-0.6.0.tar.gz) = 2494621
diff --git a/www/cherokee-devel/pkg-plist b/www/cherokee-devel/pkg-plist
index f09fdd2469e8..dcd9b7d4b3df 100644
--- a/www/cherokee-devel/pkg-plist
+++ b/www/cherokee-devel/pkg-plist
@@ -1,15 +1,14 @@
 bin/cget
 bin/cherokee-config
 bin/cherokee-panic
-bin/cherokee_logrotate
+bin/spawn-fcgi
+bin/cherokee_tweak
 @unexec for i in `find %D/etc/cherokee -name \*.default`;do if cmp -s $i ${i%%.default};then rm -f ${i%%.default};fi;done
 @unexec for i in `find %D/etc/cherokee -name \*.sample`;do if cmp -s $i ${i%%.sample};then rm -f ${i%%.sample};fi;done
 etc/cherokee/cherokee.conf.default
 etc/cherokee/cherokee.conf.perf_sample
 etc/cherokee/mime.compression.types.default
 etc/cherokee/mime.types.default
-etc/cherokee/mods-available/icons.sample
-etc/cherokee/mods-available/ssl.sample
 etc/cherokee/mods-enabled/.empty
 etc/cherokee/sites-available/.empty
 etc/cherokee/sites-enabled/.empty
@@ -17,8 +16,11 @@ etc/cherokee/ssl/.empty
 @exec for i in `find %D/etc/cherokee -name \*.default`;do if [ ! -f ${i%%.default} ];then cp $i ${i%%.default};fi;done
 @exec for i in `find %D/etc/cherokee -name \*.sample`;do if [ ! -f ${i%%.sample} ];then cp $i ${i%%.sample};fi;done
 include/cherokee/admin_client.h
+include/cherokee/avl.h
+include/cherokee/avl_r.h
 include/cherokee/buffer.h
 include/cherokee/cherokee-config.h
+include/cherokee/config_node.h
 include/cherokee/cherokee.h
 include/cherokee/common.h
 include/cherokee/connection.h
@@ -78,14 +80,10 @@ lib/cherokee/libplugin_ncsa.la
 lib/cherokee/libplugin_ncsa.so
 lib/cherokee/libplugin_nn.la
 lib/cherokee/libplugin_nn.so
-lib/cherokee/libplugin_pam.la
-lib/cherokee/libplugin_pam.so
 lib/cherokee/libplugin_phpcgi.la
 lib/cherokee/libplugin_phpcgi.so
 lib/cherokee/libplugin_plain.la
 lib/cherokee/libplugin_plain.so
-lib/cherokee/libplugin_proxy.la
-lib/cherokee/libplugin_proxy.so
 lib/cherokee/libplugin_redir.la
 lib/cherokee/libplugin_redir.so
 lib/cherokee/libplugin_round_robin.la
@@ -111,43 +109,149 @@ lib/libcherokee-server.so.0
 libdata/pkgconfig/cherokee.pc
 sbin/cherokee-admin
 sbin/cherokee
+sbin/cherokee-guardian
 share/aclocal/cherokee.m4
+%%DATADIR%%/admin/CherokeeManagement.py
+%%DATADIR%%/admin/Entry.py
+%%DATADIR%%/admin/Form.py
+%%DATADIR%%/admin/Module.py
+%%DATADIR%%/admin/ModuleAdmin.py
+%%DATADIR%%/admin/ModuleAuth.py
+%%DATADIR%%/admin/ModuleBalancer.py
+%%DATADIR%%/admin/ModuleCgi.py
+%%DATADIR%%/admin/ModuleCommon.py
+%%DATADIR%%/admin/ModuleDirlist.py
+%%DATADIR%%/admin/ModuleErrorRedir.py
+%%DATADIR%%/admin/ModuleFcgi.py
+%%DATADIR%%/admin/ModuleFile.py
+%%DATADIR%%/admin/ModuleHtdigest.py
+%%DATADIR%%/admin/ModuleHtpasswd.py
+%%DATADIR%%/admin/ModuleLdap.py
+%%DATADIR%%/admin/ModuleMirror.py
+%%DATADIR%%/admin/ModuleMysql.py
+%%DATADIR%%/admin/ModulePam.py
+%%DATADIR%%/admin/ModulePlain.py
+%%DATADIR%%/admin/ModuleRedir.py
+%%DATADIR%%/admin/ModuleRoundRobin.py
+%%DATADIR%%/admin/ModuleScgi.py
+%%DATADIR%%/admin/ModuleServerInfo.py
+%%DATADIR%%/admin/Page.py
+%%DATADIR%%/admin/PageAdvanced.py
+%%DATADIR%%/admin/PageAjaxUpdate.py
+%%DATADIR%%/admin/PageEncoders.py
+%%DATADIR%%/admin/PageEntry.py
+%%DATADIR%%/admin/PageError.py
+%%DATADIR%%/admin/PageFeedback.py
+%%DATADIR%%/admin/PageGeneral.py
+%%DATADIR%%/admin/PageIcon.py
+%%DATADIR%%/admin/PageMain.py
+%%DATADIR%%/admin/PageMime.py
+%%DATADIR%%/admin/PageVServer.py
+%%DATADIR%%/admin/PageVServers.py
+%%DATADIR%%/admin/Post.py
+%%DATADIR%%/admin/Table.py
+%%DATADIR%%/admin/Theme.py
+%%DATADIR%%/admin/VirtualServer.py
+%%DATADIR%%/admin/advanced.help.html
+%%DATADIR%%/admin/config.py
+%%DATADIR%%/admin/configured.py
+%%DATADIR%%/admin/consts.py
+%%DATADIR%%/admin/default.template.html
+%%DATADIR%%/admin/encoder.help.html
+%%DATADIR%%/admin/entry.help.html
+%%DATADIR%%/admin/error_couldnt_launch.template.html
+%%DATADIR%%/admin/error_icons_dir_missing.template.html
+%%DATADIR%%/admin/error_not_found.template.html
+%%DATADIR%%/admin/error_not_writable.template.html
+%%DATADIR%%/admin/feedback.help.html
+%%DATADIR%%/admin/general.help.html
+%%DATADIR%%/admin/icon.help.html
+%%DATADIR%%/admin/main.help.html
+%%DATADIR%%/admin/main.template.html
+%%DATADIR%%/admin/mime.help.html
+%%DATADIR%%/admin/pyscgi.py
+%%DATADIR%%/admin/server.py
+%%DATADIR%%/admin/static/css/cherokee.css
+%%DATADIR%%/admin/static/css/reset-min.css
+%%DATADIR%%/admin/static/images/background.png
+%%DATADIR%%/admin/static/images/button-left.png
+%%DATADIR%%/admin/static/images/button-right.png
+%%DATADIR%%/admin/static/images/cherokee-logo-bar.png
+%%DATADIR%%/admin/static/images/collapsed.gif
+%%DATADIR%%/admin/static/images/dialog-error.png
+%%DATADIR%%/admin/static/images/dialog-information.png
+%%DATADIR%%/admin/static/images/dialog-warning.png
+%%DATADIR%%/admin/static/images/expanded.gif
+%%DATADIR%%/admin/static/images/help.png
+%%DATADIR%%/admin/static/images/menu-active.png
+%%DATADIR%%/admin/static/images/menu-highlight.png
+%%DATADIR%%/admin/static/images/offline.png
+%%DATADIR%%/admin/static/images/online.png
+%%DATADIR%%/admin/static/images/workarea.png
+%%DATADIR%%/admin/static/js/common.js
+%%DATADIR%%/admin/static/js/icons.js
+%%DATADIR%%/admin/static/js/jquery-1.2.3.min.js
+%%DATADIR%%/admin/static/js/jquery.accordion.js
+%%DATADIR%%/admin/static/js/jquery.easing.js
+%%DATADIR%%/admin/validations.py
+%%DATADIR%%/admin/vserver.help.html
+%%DATADIR%%/admin/vservers.help.html
 %%DATADIR%%/deps/combined.deps
 %%DATADIR%%/deps/common.deps
 %%DATADIR%%/deps/error_redir.deps
 %%DATADIR%%/deps/nn.deps
 %%DATADIR%%/deps/phpcgi.deps
-%%DATADIR%%/icons/back.png
-%%DATADIR%%/icons/binary.png
+%%DATADIR%%/icons/README.txt
+%%DATADIR%%/icons/arrow_turn_left.png
 %%DATADIR%%/icons/blank.png
 %%DATADIR%%/icons/bomb.png
-%%DATADIR%%/icons/compressed.png
+%%DATADIR%%/icons/camera.png
+%%DATADIR%%/icons/cd.png
+%%DATADIR%%/icons/color_wheel.png
+%%DATADIR%%/icons/control_play.png
+%%DATADIR%%/icons/css.png
+%%DATADIR%%/icons/cup.png
+%%DATADIR%%/icons/email.png
+%%DATADIR%%/icons/film.png
 %%DATADIR%%/icons/folder.png
-%%DATADIR%%/icons/image.png
-%%DATADIR%%/icons/iso.png
-%%DATADIR%%/icons/java.png
-%%DATADIR%%/icons/movie.png
-%%DATADIR%%/icons/pdf.png
-%%DATADIR%%/icons/ps.png
-%%DATADIR%%/icons/readme.png
+%%DATADIR%%/icons/font.png
+%%DATADIR%%/icons/html.png
+%%DATADIR%%/icons/music.png
+%%DATADIR%%/icons/package.png
+%%DATADIR%%/icons/page_white.png
+%%DATADIR%%/icons/page_white_acrobat.png
+%%DATADIR%%/icons/page_white_actionscript.png
+%%DATADIR%%/icons/page_white_c.png
+%%DATADIR%%/icons/page_white_go.png
+%%DATADIR%%/icons/page_white_office.png
+%%DATADIR%%/icons/page_white_php.png
+%%DATADIR%%/icons/page_white_text.png
+%%DATADIR%%/icons/printer.png
+%%DATADIR%%/icons/ruby.png
 %%DATADIR%%/icons/script.png
-%%DATADIR%%/icons/sound.png
-%%DATADIR%%/icons/tex.png
-%%DATADIR%%/icons/text.png
-%%DATADIR%%/icons/unknown.png
 %%DATADIR%%/mime_types.txt
 %%DATADIR%%/themes/default/cherokee-logo.png
 %%DATADIR%%/themes/default/entry.html
 %%DATADIR%%/themes/default/footer.html
 %%DATADIR%%/themes/default/header.html
 %%DATADIR%%/themes/default/theme.css
+%%DATADIR%%/themes/firefox3/header.html
+%%DATADIR%%/themes/firefox3/footer.html
+%%DATADIR%%/themes/firefox3/entry.html
+%%DATADIR%%/themes/firefox3/theme.css
 www/cherokee/images/cherokee-logo.png
 www/cherokee/images/default-bg.png
 www/cherokee/images/powered_by_cherokee.png
 www/cherokee/index.html
+@dirrm %%DATADIR%%/admin/static/css
+@dirrm %%DATADIR%%/admin/static/images
+@dirrm %%DATADIR%%/admin/static/js
+@dirrm %%DATADIR%%/admin/static
+@dirrm %%DATADIR%%/admin
 @dirrm %%DATADIR%%/icons
 @dirrm %%DATADIR%%/deps
 @dirrm %%DATADIR%%/themes/default
+@dirrm %%DATADIR%%/themes/firefox3
 @dirrm %%DATADIR%%/themes
 @dirrm %%DATADIR%%
 @dirrm include/cherokee