diff --git a/AUTHORS b/AUTHORS
index dcf7e793a9..4590db1a09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2588,6 +2588,7 @@ Andrei Emeltchenko	<Andrei.Emeltchenko [AT] nokia.com>
 Marc Petit-Huguenin	<marc [AT] petit-huguenin.org>
 Kirby Files		<kfiles [AT] masergy.com>
 Ravi Valmikam           <rvalmikam [AT] airvananet.com>
+Diego Pettenò		<flameeyes [AT] gentoo.org>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
diff --git a/epan/Makefile.am b/epan/Makefile.am
index 5b0ba0cb0e..8a15c7edb1 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -84,7 +84,7 @@ MAINTAINERCLEANFILES = \
 #
 # Add the object files for missing routines, if any.
 #
-libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
+libethereal_la_LIBADD = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la @ADNS_LIBS@
 libethereal_la_DEPENDENCIES = @G_ASCII_STRTOULL_LO@ @INET_ATON_LO@ @INET_PTON_LO@ @INET_NTOP_LO@ dfilter/libdfilter.la ftypes/libftypes.la dissectors/libdissectors.la
 
 tvbtest: tvbtest.o tvbuff.o except.o strutil.o