diff --git a/.cvsignore b/.cvsignore
index 9a6ea4d..1e52cf0 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-wireshark-0.99.7-SVN-23507.tar.gz
+wireshark-0.99.7-SVN-23536.tar.gz
diff --git a/sources b/sources
index 8dd094b..31f6187 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ebfc388ed12c22faf000999c587e8baf  wireshark-0.99.7-SVN-23507.tar.gz
+6e5d9fbdc1920e0e2fe48c24c7ac9eba  wireshark-0.99.7-SVN-23536.tar.gz
diff --git a/wireshark.spec b/wireshark.spec
index dd2c549..e8d0268 100644
--- a/wireshark.spec
+++ b/wireshark.spec
@@ -1,11 +1,12 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 #define to 0 for final version
-%define svn_version 23507
+%define svn_version 23536
+%define with_adns 0
 
 Summary: 	Network traffic analyzer
 Name: 		wireshark
 Version:	0.99.7
-Release: 	0.pre1%{?dist}
+Release: 	0.pre2%{?dist}
 License: 	GPL+
 Group: 		Applications/Internet
 %if %{svn_version}
@@ -21,8 +22,7 @@ Patch3:		wireshark-nfsv4-opts.patch
 Url: 		http://www.wireshark.org/
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libpcap-devel >= 0.9
-BuildRequires: 	net-snmp-devel >= 5.4
-BuildRequires: 	net-snmp-utils >= 5.4
+BuildRequires: 	libsmi
 BuildRequires: 	zlib-devel, bzip2-devel
 BuildRequires:  openssl-devel
 BuildRequires:	glib2-devel, gtk2-devel
@@ -30,7 +30,10 @@ BuildRequires:  elfutils-devel, krb5-devel
 BuildRequires:  python, pcre-devel, libselinux
 BuildRequires:  gnutls-devel
 BuildRequires:  desktop-file-utils, automake, libtool
-BuildRequires:	htmlview, adns-devel
+BuildRequires:	xdg-utils
+%if %{with_adns}
+BuildRequires:	adns-devel
+%endif
 Obsoletes:	ethereal
 Provides:	ethereal
 
@@ -41,8 +44,11 @@ Group:		Applications/Internet
 Requires: 	gtk2
 Requires:	usermode >= 1.37
 Requires:	wireshark = %{version}-%{release}
-Requires:	net-snmp >= 5.4, net-snmp-libs >= 5.4
-Requires:	xdg-utils, adns
+Requires:	libsmi
+Requires:	xdg-utils
+%if %{with_adns}
+Requires:	adns
+%endif
 Obsoletes:	ethereal-gnome
 Provides:	ethereal-gnome
 
@@ -84,13 +90,17 @@ export LDFLAGS="$LDFLAGS -lm -lcrypto"
    --bindir=%{_sbindir} \
    --enable-zlib \
    --enable-ipv6 \
-   --with-net-snmp \
+   --with-libsmi \
    --with-gnu-ld \
    --disable-static \
    --disable-usr-local \
    --enable-gtk2 \
    --with-pic \
+%if %{with_adns}
    --with-adns \
+%else
+   --with-adns=no \
+%endif
    --with-ssl \
    --disable-warnings-as-errors \
    --with-plugindir=%{_libdir}/%{name}/plugins/%{version}
@@ -186,6 +196,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Nov 26 2007 Radek Vokal <rvokal@redhat.com> 0.99.7-0.pre2
+- switch to libsmi from net-snmp
+- disable ADNS due to its lack of Ipv6 support
+- 0.99.7 prerelease 2
+
 * Tue Nov 20 2007 Radek Vokal <rvokal@redhat.com> 0.99.7-0.pre1
 - upgrade to 0.99.7 pre-release