diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index dcc1f93720e..fdf10f0ec8c 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2008/03/21 19:25:33 rui Exp $
+# $OpenBSD: Makefile,v 1.16 2008/05/05 19:32:02 rui Exp $
 
 SHARED_ONLY=		Yes
 
@@ -8,7 +8,7 @@ COMMENT-mysql=		freeradius mysql rlm addon
 COMMENT-pgsql=		freeradius pgsql rlm addon
 COMMENT-ldap=		freeradius ldap rlm addon
 
-V=			2.0.3
+V=			2.0.4
 DISTNAME=		freeradius-server-$V
 PKGNAME-main=		freeradius-$V
 PKGNAME-iodbc=		freeradius-iodbc-$V
@@ -120,8 +120,7 @@ post-configure:
 
 post-install:
 .for f in bin/radlast bin/radtest sbin/checkrad sbin/radwatch \
-    sbin/check-radiusd-config share/examples/freeradius/dictionary \
-    share/examples/freeradius/radiusd.conf
+    share/examples/freeradius/dictionary share/examples/freeradius/radiusd.conf 
 	@perl -pi -e 's,\$${DESTDIR},,g' ${PREFIX}/$f
 .endfor
 
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 2544c5ec978..f2d4d49350c 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,5 +1,5 @@
-MD5 (freeradius-server-2.0.3.tar.bz2) = PNZH9AiA3uhpPy50q1QW6Q==
-RMD160 (freeradius-server-2.0.3.tar.bz2) = Q9LRwXpWz4Cm0u/f8osi4IPtb+M=
-SHA1 (freeradius-server-2.0.3.tar.bz2) = IVkvIAnhjM8dzQzGa6pMRZzNIrk=
-SHA256 (freeradius-server-2.0.3.tar.bz2) = MYTpvm2I3zzfcqCKfgAiLBe8NgKJ7PFCGd+cgdaNf3k=
-SIZE (freeradius-server-2.0.3.tar.bz2) = 2298963
+MD5 (freeradius-server-2.0.4.tar.bz2) = C2PR115RvZS2LBHGOfoyng==
+RMD160 (freeradius-server-2.0.4.tar.bz2) = ZpFftVEVc7UCt6/blv0K24B/qik=
+SHA1 (freeradius-server-2.0.4.tar.bz2) = NAjQmpkMY99nGJOQl2UKRj1lSpk=
+SHA256 (freeradius-server-2.0.4.tar.bz2) = UPcv5lnzIURgXyqKfspdEooYRw+j3//+fwFTt1RWl8g=
+SIZE (freeradius-server-2.0.4.tar.bz2) = 2314988
diff --git a/net/freeradius/patches/patch-configure b/net/freeradius/patches/patch-configure
index 2af96636084..4e520e29006 100644
--- a/net/freeradius/patches/patch-configure
+++ b/net/freeradius/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
---- configure.orig	Thu Jan 10 10:38:42 2008
-+++ configure	Mon Jan 21 16:21:31 2008
-@@ -4864,7 +4864,7 @@ fi
+$OpenBSD: patch-configure,v 1.5 2008/05/05 19:32:02 rui Exp $
+--- configure.orig	Sat Apr 26 16:10:09 2008
++++ configure	Sat May  3 15:08:10 2008
+@@ -4865,7 +4865,7 @@ fi
      LTDLINCL='-I${top_srcdir}/''libltdl'
    else
      ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
      LTDLINCL=
    fi
    # For backwards non-gettext consistent compatibility...
-@@ -8876,7 +8876,6 @@ bsdi[45]*)
+@@ -8877,7 +8877,6 @@ bsdi[45]*)
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
@@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
    shlibpath_var=LD_LIBRARY_PATH
    sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
    sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-@@ -20341,13 +20340,13 @@ fi
+@@ -20360,13 +20359,13 @@ fi
  done
  
  
@@ -35,7 +35,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20404,7 +20403,7 @@ fi
+@@ -20423,7 +20422,7 @@ fi
  echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
  if test $ac_cv_lib_pthread_pthread_create = yes; then
     CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
@@ -44,7 +44,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
  else
    { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
  echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
-@@ -20654,7 +20653,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
+@@ -20673,7 +20672,6 @@ if test "${ac_cv_lib_resolv_inet_aton+set}" = set; the
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -52,7 +52,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20714,8 +20712,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
+@@ -20733,8 +20731,6 @@ if test $ac_cv_lib_resolv_inet_aton = yes; then
  #define HAVE_LIBRESOLV 1
  _ACEOF
  
@@ -61,7 +61,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
  fi
  
  
-@@ -20872,7 +20868,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
+@@ -20891,7 +20887,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -70,7 +70,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22968,7 +22964,7 @@ _ACEOF
+@@ -22989,7 +22985,7 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -79,7 +79,7 @@ $OpenBSD: patch-configure,v 1.4 2008/01/21 22:21:24 rui Exp $
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
-@@ -23035,7 +23031,7 @@ _ACEOF
+@@ -23056,7 +23052,7 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
diff --git a/net/freeradius/patches/patch-raddb_radiusd_conf_in b/net/freeradius/patches/patch-raddb_radiusd_conf_in
index ebdfa26a887..9fe748a3f5a 100644
--- a/net/freeradius/patches/patch-raddb_radiusd_conf_in
+++ b/net/freeradius/patches/patch-raddb_radiusd_conf_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
---- raddb/radiusd.conf.in.orig	Tue Mar  4 16:53:02 2008
-+++ raddb/radiusd.conf.in	Fri Mar 21 16:50:50 2008
+$OpenBSD: patch-raddb_radiusd_conf_in,v 1.7 2008/05/05 19:32:02 rui Exp $
+--- raddb/radiusd.conf.in.orig	Sat Apr 26 16:14:33 2008
++++ raddb/radiusd.conf.in	Sat May  3 15:08:10 2008
 @@ -54,7 +54,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
@@ -30,7 +30,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  #  max_request_time: The maximum time (in seconds) to handle a request.
  #
-@@ -448,8 +448,8 @@ security {
+@@ -450,8 +450,8 @@ security {
  #
  #  allowed values: {no, yes}
  #
@@ -41,7 +41,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  
  # CLIENTS CONFIGURATION
-@@ -465,7 +465,7 @@ $INCLUDE proxy.conf
+@@ -467,7 +467,7 @@ $INCLUDE proxy.conf
  #  Anything listed in 'clients.conf' will take precedence over the
  #  information from the old-style configuration files.
  #
@@ -50,7 +50,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  
  # SNMP CONFIGURATION
-@@ -477,7 +477,7 @@ $INCLUDE clients.conf
+@@ -479,7 +479,7 @@ $INCLUDE clients.conf
  #  'snmp' attribute to 'yes'
  #
  snmp	= no
@@ -59,7 +59,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  
  # THREAD POOL CONFIGURATION
-@@ -649,7 +649,7 @@ modules {
+@@ -651,7 +651,7 @@ modules {
  	#  For all EAP related authentications.
  	#  Now in another file, because it is very large.
  	#
@@ -68,7 +68,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  	# Microsoft CHAP authentication
  	#
-@@ -1294,7 +1294,7 @@ $INCLUDE eap.conf
+@@ -1319,7 +1319,7 @@ $INCLUDE eap.conf
  	#  Include another file that has the SQL-related configuration.
  	#  This is another file only because it tends to be big.
  	#
@@ -77,7 +77,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  
  	#  For Cisco VoIP specific accounting with Postgresql,
-@@ -1488,8 +1488,8 @@ $INCLUDE eap.conf
+@@ -1513,8 +1513,8 @@ $INCLUDE eap.conf
  	#  totally dependent on the SQL module to process Accounting
  	#  packets.
  	#
@@ -88,7 +88,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  	#
  	# The "always" module is here for debugging purposes. Each
-@@ -1792,10 +1792,10 @@ $INCLUDE eap.conf
+@@ -1817,10 +1817,10 @@ $INCLUDE eap.conf
  		#key = "%{NAS-IP-Address} %{NAS-Port}"
  	}
  
@@ -101,7 +101,7 @@ $OpenBSD: patch-raddb_radiusd_conf_in,v 1.6 2008/03/21 19:25:33 rui Exp $
  
  	#
  	#  Kerberos.  See doc/rlm_krb5 for minimal docs.
-@@ -1890,7 +1890,7 @@ instantiate {
+@@ -1915,7 +1915,7 @@ instantiate {
  #	to multiple times.
  #
  ######################################################################
diff --git a/net/freeradius/pkg/PLIST-main b/net/freeradius/pkg/PLIST-main
index 5091e33925f..3afd37d5938 100644
--- a/net/freeradius/pkg/PLIST-main
+++ b/net/freeradius/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.8 2008/03/21 19:25:33 rui Exp $
+@comment $OpenBSD: PLIST-main,v 1.9 2008/05/05 19:32:02 rui Exp $
 @conflict radiusd-cistron-*
 @conflict radiusd-lucent-*
 @pkgpath net/freeradius
@@ -91,9 +91,6 @@ lib/freeradius/rlm_eap_sim.so
 lib/freeradius/rlm_eap_tls.a
 lib/freeradius/rlm_eap_tls.la
 lib/freeradius/rlm_eap_tls.so
-lib/freeradius/rlm_eap_tnc.a
-lib/freeradius/rlm_eap_tnc.la
-lib/freeradius/rlm_eap_tnc.so
 lib/freeradius/rlm_eap_ttls.a
 lib/freeradius/rlm_eap_ttls.la
 lib/freeradius/rlm_eap_ttls.so
@@ -202,7 +199,6 @@ lib/libfreeradius-radius.la
 @man man/man8/radsqlrelay.8
 @man man/man8/radwatch.8
 @man man/man8/rlm_ippool_tool.8
-sbin/check-radiusd-config
 sbin/checkrad
 sbin/radiusd
 sbin/radwatch
@@ -366,8 +362,16 @@ share/examples/freeradius/radiusd.conf
 share/examples/freeradius/sites-available/
 @sample ${SYSCONFDIR}/raddb/sites-available/
 share/examples/freeradius/sites-available/README
+share/examples/freeradius/sites-available/buffered-sql
+share/examples/freeradius/sites-available/copy-acct-to-home-server
 share/examples/freeradius/sites-available/default
+share/examples/freeradius/sites-available/dhcp
 share/examples/freeradius/sites-available/example
+share/examples/freeradius/sites-available/inner-tunnel
+share/examples/freeradius/sites-available/proxy-inner-tunnel
+share/examples/freeradius/sites-available/robust-proxy-accounting
+share/examples/freeradius/sites-available/virtual.example.com
+share/examples/freeradius/sites-available/vmps
 share/examples/freeradius/sites-enabled/
 @sample ${SYSCONFDIR}/raddb/sites-enabled/
 share/examples/freeradius/sites-enabled/default
@@ -387,6 +391,7 @@ share/examples/freeradius/sql/mssql/dialup.conf
 share/examples/freeradius/sql/mssql/schema.sql
 share/examples/freeradius/sql/mysql/
 @sample ${SYSCONFDIR}/raddb/sql/mysql/
+share/examples/freeradius/sql/mysql/admin.sql
 share/examples/freeradius/sql/mysql/counter.conf
 @sample ${SYSCONFDIR}/raddb/sql/mysql/counter.conf
 share/examples/freeradius/sql/mysql/dialup.conf
@@ -403,6 +408,7 @@ share/examples/freeradius/sql/oracle/nas.sql
 share/examples/freeradius/sql/oracle/schema.sql
 share/examples/freeradius/sql/postgresql/
 @sample ${SYSCONFDIR}/raddb/sql/postgresql/
+share/examples/freeradius/sql/postgresql/admin.sql
 share/examples/freeradius/sql/postgresql/cisco_h323_db_schema.sql
 share/examples/freeradius/sql/postgresql/counter.conf
 @sample ${SYSCONFDIR}/raddb/sql/postgresql/counter.conf
@@ -449,10 +455,12 @@ share/freeradius/dictionary.cisco
 share/freeradius/dictionary.cisco.bbsm
 share/freeradius/dictionary.cisco.vpn3000
 share/freeradius/dictionary.cisco.vpn5000
+share/freeradius/dictionary.clavister
 share/freeradius/dictionary.colubris
 share/freeradius/dictionary.columbia_university
 share/freeradius/dictionary.compat
 share/freeradius/dictionary.cosine
+share/freeradius/dictionary.dhcp
 share/freeradius/dictionary.digium
 share/freeradius/dictionary.epygi
 share/freeradius/dictionary.ericsson