diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 8fc54e65ee5a..dd63427e2928 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.10.6
-PORTREVISION=	1
+PORTVERSION=	0.10.8
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
 		ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \
@@ -15,7 +14,7 @@ MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
 		ftp://ftp.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/ \
 		http://www.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/
 
-MAINTAINER=	billf@FreeBSD.org
+MAINTAINER=	marcus@FreeBSD.org
 COMMENT?=	A powerful network analyzer/capture tool
 
 USE_PERL5_BUILD=yes
@@ -24,7 +23,7 @@ WANT_GNOME=	yes
 CONFIGURE_ARGS+=	--program-transform-name=""
 INSTALLS_SHLIB=	yes
 
-.for x in capinfo editcap idl2eth mergecap text2pcap
+.for x in capinfos editcap idl2eth mergecap text2pcap
 .if defined(LITE)
 PLIST_SUB+=		${x:U}="@comment $x not installed"
 CONFIGURE_ARGS+=	--enable-$x=no
diff --git a/net/ethereal/distinfo b/net/ethereal/distinfo
index e32c5907e968..75c84405c89c 100644
--- a/net/ethereal/distinfo
+++ b/net/ethereal/distinfo
@@ -1,2 +1,2 @@
-MD5 (ethereal-0.10.6.tar.bz2) = 722a2529c3a19b5b81c825bca444baea
-SIZE (ethereal-0.10.6.tar.bz2) = 5046796
+MD5 (ethereal-0.10.8.tar.bz2) = aa1f1470f7f8bd301c92dd199a4ae60e
+SIZE (ethereal-0.10.8.tar.bz2) = 5351028
diff --git a/net/ethereal/files/patch-capture.c b/net/ethereal/files/patch-capture_loop.c
similarity index 82%
rename from net/ethereal/files/patch-capture.c
rename to net/ethereal/files/patch-capture_loop.c
index a31c93ba51bc..55b53f795033 100644
--- a/net/ethereal/files/patch-capture.c
+++ b/net/ethereal/files/patch-capture_loop.c
@@ -1,5 +1,5 @@
---- capture.c.orig	Thu Jul 22 00:23:01 2004
-+++ capture.c	Thu Jul 22 00:23:15 2004
+--- capture_loop.c.orig	Thu Jul 22 00:23:01 2004
++++ capture_loop.c	Thu Jul 22 00:23:15 2004
 @@ -126,7 +126,7 @@
   * XXX - the various BSDs appear to define BSD in <sys/param.h>; we don't
   * want to include it if it's not present on this platform, however.
diff --git a/net/ethereal/files/patch-configure b/net/ethereal/files/patch-configure
index da831bbcb12a..6962120d124c 100644
--- a/net/ethereal/files/patch-configure
+++ b/net/ethereal/files/patch-configure
@@ -1,24 +1,20 @@
---- configure.orig	Thu Aug 12 22:04:27 2004
-+++ configure	Fri Aug 13 18:40:18 2004
-@@ -15934,7 +15934,7 @@
- 	  KRB5_LIBS="-lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt -lresolv"
- 	  ethereal_save_LDFLAGS="$LDFLAGS"
- 	  LDFLAGS="$LDFLAGS -L$krb5_dir/lib"
--	  ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
-+	  ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
- 	else
- 	  # Extract the first word of "krb5-config", so it can be a program name with args.
- set dummy krb5-config; ac_word=$2
-@@ -15977,10 +15977,10 @@
+--- configure.orig	Tue Dec 14 15:39:30 2004
++++ configure	Sat Dec 18 00:17:55 2004
+@@ -16120,7 +16120,7 @@
+ 	  #
+ 	  CFLAGS="$CFLAGS -I$krb5_dir/include"
+ 	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
+-	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
++	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
+ 	  ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+ 	  ac_krb5_version="$ac_heimdal_version$ac_mit_version"
+ 	  if test "x$ac_krb5_version" = "xHEIMDAL"
+@@ -16178,7 +16178,7 @@
  
  	  if test -x "$KRB5_CONFIG"
  	  then
 -	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
 +	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'`
+ 	    KRB5_LIBS=`"$KRB5_CONFIG" --libs`
  	    CFLAGS="$CFLAGS $KRB5_FLAGS"
-             CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
--	    KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'`
-+	    KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//' | sed -e 's/@INCLUDE_des@//g'`
- 	    KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
- 	    # Looks like krb5-config is lacking -lresolv on some systems
- 	    echo "$as_me:$LINENO: checking whether library list looks OK" >&5
+ 	    CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
diff --git a/net/ethereal/pkg-plist b/net/ethereal/pkg-plist
index 91204fa4255d..eaa43c5e4bf1 100644
--- a/net/ethereal/pkg-plist
+++ b/net/ethereal/pkg-plist
@@ -1,4 +1,4 @@
-%%CAPINFO%%
+%%CAPINFOS%%
 bin/dftest
 %%EDITCAP%%
 %%ETHEREAL%%
@@ -32,32 +32,32 @@ lib/libethereal.so.0
 lib/libwiretap.a
 lib/libwiretap.so
 lib/libwiretap.so.0
-share/ethereal/AUTHORS-SHORT
-share/ethereal/capinfo.html
-share/ethereal/diameter/dictionary.dtd
-share/ethereal/diameter/dictionary.xml
-share/ethereal/diameter/mobileipv4.xml
-share/ethereal/diameter/nasreq.xml
-share/ethereal/diameter/sunping.xml
-share/ethereal/editcap.html
-share/ethereal/ethereal-filter.html
-share/ethereal/ethereal.html
-share/ethereal/help/capture_filters.txt
-share/ethereal/help/capturing.txt
-share/ethereal/help/display_filters.txt
-share/ethereal/help/faq.txt
-share/ethereal/help/getting_started.txt
-share/ethereal/help/overview.txt
-share/ethereal/help/toc
-share/ethereal/help/well_known.txt
-share/ethereal/idl2eth.html
-share/ethereal/manuf
-share/ethereal/mergecap.html
-share/ethereal/tethereal.html
-share/ethereal/text2pcap.html
+%%DATADIR%%/AUTHORS-SHORT
+%%DATADIR%%/capinfos.html
+%%DATADIR%%/diameter/dictionary.dtd
+%%DATADIR%%/diameter/dictionary.xml
+%%DATADIR%%/diameter/imscxdx.xml
+%%DATADIR%%/diameter/mobileipv4.xml
+%%DATADIR%%/diameter/nasreq.xml
+%%DATADIR%%/diameter/sunping.xml
+%%DATADIR%%/editcap.html
+%%DATADIR%%/ethereal-filter.html
+%%DATADIR%%/ethereal.html
+%%DATADIR%%/help/capture_filters.txt
+%%DATADIR%%/help/capturing.txt
+%%DATADIR%%/help/display_filters.txt
+%%DATADIR%%/help/faq.txt
+%%DATADIR%%/help/getting_started.txt
+%%DATADIR%%/help/overview.txt
+%%DATADIR%%/help/toc
+%%DATADIR%%/idl2eth.html
+%%DATADIR%%/manuf
+%%DATADIR%%/mergecap.html
+%%DATADIR%%/tethereal.html
+%%DATADIR%%/text2pcap.html
 @dirrm lib/ethereal/plugins/%%PORTVERSION%%
 @dirrm lib/ethereal/plugins
 @dirrm lib/ethereal
-@dirrm share/ethereal/diameter
-@dirrm share/ethereal/help
-@dirrm share/ethereal
+@dirrm %%DATADIR%%/diameter
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 8fc54e65ee5a..dd63427e2928 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ethereal
-PORTVERSION=	0.10.6
-PORTREVISION=	1
+PORTVERSION=	0.10.8
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
 		ftp://gd.tuwien.ac.at/infosys/security/ethereal/all-versions/ \
@@ -15,7 +14,7 @@ MASTER_SITES=	ftp://ftp.ethereal.com/pub/ethereal/all-versions/ \
 		ftp://ftp.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/ \
 		http://www.mirrors.wiretapped.net/pub/security/packet-capture/ethereal/all-versions/
 
-MAINTAINER=	billf@FreeBSD.org
+MAINTAINER=	marcus@FreeBSD.org
 COMMENT?=	A powerful network analyzer/capture tool
 
 USE_PERL5_BUILD=yes
@@ -24,7 +23,7 @@ WANT_GNOME=	yes
 CONFIGURE_ARGS+=	--program-transform-name=""
 INSTALLS_SHLIB=	yes
 
-.for x in capinfo editcap idl2eth mergecap text2pcap
+.for x in capinfos editcap idl2eth mergecap text2pcap
 .if defined(LITE)
 PLIST_SUB+=		${x:U}="@comment $x not installed"
 CONFIGURE_ARGS+=	--enable-$x=no
diff --git a/net/wireshark/distinfo b/net/wireshark/distinfo
index e32c5907e968..75c84405c89c 100644
--- a/net/wireshark/distinfo
+++ b/net/wireshark/distinfo
@@ -1,2 +1,2 @@
-MD5 (ethereal-0.10.6.tar.bz2) = 722a2529c3a19b5b81c825bca444baea
-SIZE (ethereal-0.10.6.tar.bz2) = 5046796
+MD5 (ethereal-0.10.8.tar.bz2) = aa1f1470f7f8bd301c92dd199a4ae60e
+SIZE (ethereal-0.10.8.tar.bz2) = 5351028
diff --git a/net/wireshark/files/patch-capture.c b/net/wireshark/files/patch-capture_loop.c
similarity index 82%
rename from net/wireshark/files/patch-capture.c
rename to net/wireshark/files/patch-capture_loop.c
index a31c93ba51bc..55b53f795033 100644
--- a/net/wireshark/files/patch-capture.c
+++ b/net/wireshark/files/patch-capture_loop.c
@@ -1,5 +1,5 @@
---- capture.c.orig	Thu Jul 22 00:23:01 2004
-+++ capture.c	Thu Jul 22 00:23:15 2004
+--- capture_loop.c.orig	Thu Jul 22 00:23:01 2004
++++ capture_loop.c	Thu Jul 22 00:23:15 2004
 @@ -126,7 +126,7 @@
   * XXX - the various BSDs appear to define BSD in <sys/param.h>; we don't
   * want to include it if it's not present on this platform, however.
diff --git a/net/wireshark/files/patch-configure b/net/wireshark/files/patch-configure
index da831bbcb12a..6962120d124c 100644
--- a/net/wireshark/files/patch-configure
+++ b/net/wireshark/files/patch-configure
@@ -1,24 +1,20 @@
---- configure.orig	Thu Aug 12 22:04:27 2004
-+++ configure	Fri Aug 13 18:40:18 2004
-@@ -15934,7 +15934,7 @@
- 	  KRB5_LIBS="-lkrb5 -lasn1 $SSL_LIBS -lroken -lcrypt -lresolv"
- 	  ethereal_save_LDFLAGS="$LDFLAGS"
- 	  LDFLAGS="$LDFLAGS -L$krb5_dir/lib"
--	  ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/i'`
-+	  ac_krb5_version=`grep -i heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
- 	else
- 	  # Extract the first word of "krb5-config", so it can be a program name with args.
- set dummy krb5-config; ac_word=$2
-@@ -15977,10 +15977,10 @@
+--- configure.orig	Tue Dec 14 15:39:30 2004
++++ configure	Sat Dec 18 00:17:55 2004
+@@ -16120,7 +16120,7 @@
+ 	  #
+ 	  CFLAGS="$CFLAGS -I$krb5_dir/include"
+ 	  CPPFLAGS="$CPPFLAGS -I$krb5_dir/include"
+-	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*heimdal.*$/HEIMDAL/'`
++	  ac_heimdal_version=`grep heimdal $krb5_dir/include/krb5.h | head -n 1 | tr "[:lower:]" "[:upper:]" sed 's/^.*heimdal.*$/HEIMDAL/'`
+ 	  ac_mit_version=`grep 'Massachusetts Institute of Technology' $krb5_dir/include/krb5.h | head -n 1 | sed 's/^.*Massachusetts Institute of Technology.*$/MIT/'`
+ 	  ac_krb5_version="$ac_heimdal_version$ac_mit_version"
+ 	  if test "x$ac_krb5_version" = "xHEIMDAL"
+@@ -16178,7 +16178,7 @@
  
  	  if test -x "$KRB5_CONFIG"
  	  then
 -	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags`
 +	    KRB5_FLAGS=`"$KRB5_CONFIG" --cflags | sed -e 's/@INCLUDE_des@//g'`
+ 	    KRB5_LIBS=`"$KRB5_CONFIG" --libs`
  	    CFLAGS="$CFLAGS $KRB5_FLAGS"
-             CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
--	    KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//'`
-+	    KRB5_LIBS=`"$KRB5_CONFIG" --libs | sed 's/-lcrypto//' | sed -e 's/@INCLUDE_des@//g'`
- 	    KRB5_LIBS="$KRB5_LIBS $SSL_LIBS"
- 	    # Looks like krb5-config is lacking -lresolv on some systems
- 	    echo "$as_me:$LINENO: checking whether library list looks OK" >&5
+ 	    CPPFLAGS="$CPPFLAGS $KRB5_FLAGS"
diff --git a/net/wireshark/pkg-plist b/net/wireshark/pkg-plist
index 91204fa4255d..eaa43c5e4bf1 100644
--- a/net/wireshark/pkg-plist
+++ b/net/wireshark/pkg-plist
@@ -1,4 +1,4 @@
-%%CAPINFO%%
+%%CAPINFOS%%
 bin/dftest
 %%EDITCAP%%
 %%ETHEREAL%%
@@ -32,32 +32,32 @@ lib/libethereal.so.0
 lib/libwiretap.a
 lib/libwiretap.so
 lib/libwiretap.so.0
-share/ethereal/AUTHORS-SHORT
-share/ethereal/capinfo.html
-share/ethereal/diameter/dictionary.dtd
-share/ethereal/diameter/dictionary.xml
-share/ethereal/diameter/mobileipv4.xml
-share/ethereal/diameter/nasreq.xml
-share/ethereal/diameter/sunping.xml
-share/ethereal/editcap.html
-share/ethereal/ethereal-filter.html
-share/ethereal/ethereal.html
-share/ethereal/help/capture_filters.txt
-share/ethereal/help/capturing.txt
-share/ethereal/help/display_filters.txt
-share/ethereal/help/faq.txt
-share/ethereal/help/getting_started.txt
-share/ethereal/help/overview.txt
-share/ethereal/help/toc
-share/ethereal/help/well_known.txt
-share/ethereal/idl2eth.html
-share/ethereal/manuf
-share/ethereal/mergecap.html
-share/ethereal/tethereal.html
-share/ethereal/text2pcap.html
+%%DATADIR%%/AUTHORS-SHORT
+%%DATADIR%%/capinfos.html
+%%DATADIR%%/diameter/dictionary.dtd
+%%DATADIR%%/diameter/dictionary.xml
+%%DATADIR%%/diameter/imscxdx.xml
+%%DATADIR%%/diameter/mobileipv4.xml
+%%DATADIR%%/diameter/nasreq.xml
+%%DATADIR%%/diameter/sunping.xml
+%%DATADIR%%/editcap.html
+%%DATADIR%%/ethereal-filter.html
+%%DATADIR%%/ethereal.html
+%%DATADIR%%/help/capture_filters.txt
+%%DATADIR%%/help/capturing.txt
+%%DATADIR%%/help/display_filters.txt
+%%DATADIR%%/help/faq.txt
+%%DATADIR%%/help/getting_started.txt
+%%DATADIR%%/help/overview.txt
+%%DATADIR%%/help/toc
+%%DATADIR%%/idl2eth.html
+%%DATADIR%%/manuf
+%%DATADIR%%/mergecap.html
+%%DATADIR%%/tethereal.html
+%%DATADIR%%/text2pcap.html
 @dirrm lib/ethereal/plugins/%%PORTVERSION%%
 @dirrm lib/ethereal/plugins
 @dirrm lib/ethereal
-@dirrm share/ethereal/diameter
-@dirrm share/ethereal/help
-@dirrm share/ethereal
+@dirrm %%DATADIR%%/diameter
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%