configure.in                  |   14 +-------------
 epan/Makefile.am              |    3 +++
 epan/dissectors/packet-giop.c |    2 ++
 epan/prefs.c                  |    2 +-
 wiretap/Makefile.am           |    2 +-
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/configure.in b/configure.in
index 646cb19..6f6d6d4 100644
--- a/configure.in
+++ b/configure.in
@@ -54,19 +54,7 @@ then
 	#
 	AC_MSG_ERROR(I couldn't find pod2html; make sure it's installed and in your path)
 fi
-AC_PATH_PROG(HTML_VIEWER, xdg-open)
-if test "x$HTML_VIEWER" = x
-then
-	AC_PATH_PROG(HTML_VIEWER, htmlview)
-	if test "x$HTML_VIEWER" = x
-	then
-		AC_DEFINE_UNQUOTED(HTML_VIEWER, "mozilla", [HTML viewer, e.g. mozilla])
-	else
-		AC_DEFINE_UNQUOTED(HTML_VIEWER, "htmlview", [HTML viewer, e.g. mozilla])
-	fi
-else
-	AC_DEFINE_UNQUOTED(HTML_VIEWER, "xdg-open", [HTML viewer, e.g. mozilla])
-fi
+AC_DEFINE_UNQUOTED(HTML_VIEWER, "url_handler.sh", [HTML viewer, e.g. mozilla])
 
 AC_PATH_PROG(LEX, flex)
 AC_PATH_PROG(PYTHON, python)
diff --git a/epan/Makefile.am b/epan/Makefile.am
index ef51f9e..648dfdd 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -128,14 +128,17 @@ MAINTAINERCLEANFILES = \
 #
 libwireshark_la_LIBADD = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
 	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
+	$(top_builddir)/wiretap/libwiretap.la \
 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
 	dfilter/libdfilter.la dissectors/libcleandissectors.la \
 	dissectors/libdissectors.la dissectors/libasndissectors.la \
 	dissectors/libpidldissectors.la $(wslua_lib) @SOCKET_LIBS@ @NSL_LIBS@ \
+	@GLIB_LIBS@ \
 	@ADNS_LIBS@ @LIBGCRYPT_LIBS@ @LIBGNUTLS_LIBS@ @LIBICONV@ @KRB5_LIBS@ \
 	@SSL_LIBS@ @LIBSMI_LDFLAGS@ -lm
 libwireshark_la_DEPENDENCIES = @G_ASCII_STRCASECMP_LO@ @G_ASCII_STRTOULL_LO@ \
 	@INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ libwireshark_generated.la \
+	$(top_builddir)/wiretap/libwiretap.la \
 	libwireshark_asmopt.la crypt/libairpdcap.la ftypes/libftypes.la \
 	dfilter/libdfilter.la dissectors/libcleandissectors.la \
 	dissectors/libdissectors.la dissectors/libasndissectors.la \
diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c
index 201d694..a89222b 100644
--- a/epan/dissectors/packet-giop.c
+++ b/epan/dissectors/packet-giop.c
@@ -1721,6 +1721,8 @@ static gboolean try_heuristic_giop_dissector(tvbuff_t *tvb, packet_info *pinfo,
 
   if (len == 0)
     return FALSE;
+  if (*offset > header->message_size)
+    return FALSE;
 
   saved_proto = pinfo->current_proto;
   for (i=0; i<len; i++) {
diff --git a/epan/prefs.c b/epan/prefs.c
index d1f9acb..e3cc8e9 100644
--- a/epan/prefs.c
+++ b/epan/prefs.c
@@ -1176,7 +1176,7 @@ init_prefs(void) {
    */
   prefs.gui_font_name1 = g_strdup("-misc-fixed-medium-r-semicondensed-*-*-100-*-*-*-*-iso8859-1");
   /* XXX- is this the correct default font name for GTK2 none win32? */
-  prefs.gui_font_name2 = g_strdup("Monospace 10");
+  prefs.gui_font_name2 = g_strdup("Misc Fixed 10");
 #endif
   prefs.gui_marked_fg.pixel        =     65535;
   prefs.gui_marked_fg.red          =     65535;
diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am
index 3ab45b3..55dfbcc 100644
--- a/wiretap/Makefile.am
+++ b/wiretap/Makefile.am
@@ -67,7 +67,7 @@ EXTRA_DIST = \
 	$(GENERATOR_FILES) 	\
 	$(GENERATED_FILES)
 
-libwiretap_la_LIBADD = libwiretap_generated.la
+libwiretap_la_LIBADD = @GLIB_LIBS@ libwiretap_generated.la
 libwiretap_la_DEPENDENCIES = libwiretap_generated.la
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh