diff --git a/.gitignore b/.gitignore
index 40237d0..018f399 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ radvd-1.6.tar.gz
 /radvd-1.11.tar.gz
 /radvd-1.12.tar.gz
 /radvd-1.14.tar.gz
+/radvd-2.0.tar.bz2
diff --git a/radvd.spec b/radvd.spec
index 5aedc5b..24ad55e 100644
--- a/radvd.spec
+++ b/radvd.spec
@@ -1,19 +1,19 @@
 Summary:    A Router Advertisement daemon
 Name:       radvd
-Version:    1.14
-Release: 1%{?dist}
+Version:    2.0
+Release:    1%{?dist}
 # The code includes the advertising clause, so it's GPL-incompatible
 License:    BSD with advertising
 Group:      System Environment/Daemons
 URL:        http://www.litech.org/radvd/
-Source0:    %{url}dist/%{name}-%{version}.tar.gz
+Source0:    %{url}dist/%{name}-%{version}.tar.bz2
 Source1:    radvd-tmpfs.conf
 Source2:    radvd.service
-BuildRequires:      byacc
+BuildRequires:      bison
 BuildRequires:      flex
 BuildRequires:      flex-static
-BuildRequires:      libdaemon-devel
 BuildRequires:      pkgconfig
+BuildRequires:      check-devel
 BuildRequires:      systemd-units
 Requires(postun):   systemd-units
 Requires(preun):    systemd-units
@@ -33,7 +33,7 @@ services.
 
 %prep
 %setup -q
-for F in CHANGES-1; do
+for F in CHANGES; do
     iconv -f iso-8859-1 -t utf-8 < "$F" > "${F}.new"
     touch -r "$F" "${F}.new"
     mv "${F}.new" "$F"
@@ -42,7 +42,9 @@ done
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fPIE" 
 export LDFLAGS='-pie -Wl,-z,relro,-z,now,-z,noexecstack,-z,nodlopen'
-%configure --with-pidfile=%{_localstatedir}/run/radvd/radvd.pid
+%configure \
+    --disable-silent-rules \
+    --with-pidfile=%{_localstatedir}/run/radvd/radvd.pid
 make %{?_smp_mflags} 
 
 %install
@@ -59,6 +61,10 @@ install -d -m 755 $RPM_BUILD_ROOT%{_tmpfilesdir}
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_tmpfilesdir}/radvd.conf
 install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_unitdir}
 
+%check
+# The tests don't work, see https://github.com/reubenhwk/radvd/issues/30
+#make check
+
 %postun
 %systemd_postun_with_restart radvd.service
 
@@ -76,7 +82,7 @@ getent passwd radvd >/dev/null || \
 exit 0
 
 %files
-%doc CHANGES-1 COPYRIGHT INTRO.html README TODO
+%doc CHANGES COPYRIGHT INTRO.html README TODO
 %{_unitdir}/radvd.service
 %config(noreplace) %{_sysconfdir}/radvd.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/radvd
@@ -88,6 +94,9 @@ exit 0
 %{_sbindir}/radvdump
 
 %changelog
+* Thu Jul 17 2014 Pavel Šimerda <psimerda@redhat.com> - 2.0-1
+- new version 2.0
+
 * Fri Jul 11 2014 Pavel Šimerda <psimerda@redhat.com> - 1.14-1
 - new version 1.14
 
diff --git a/sources b/sources
index 90c6ed4..9ee812f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a257e05bd6a435ef948d3b407726d56f  radvd-1.14.tar.gz
+2f6d78c6509c4a6f8c71d82b074f8d83  radvd-2.0.tar.bz2