diff --git a/.gitignore b/.gitignore
index 9f02174..23ae852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /.build-*.log
 /avahi-0.6.30.tar.gz
 *.src.rpm
+/avahi-0.6.31.tar.gz
+/avahi-0.6.3?/
diff --git a/avahi.spec b/avahi.spec
index f83307f..01004a1 100644
--- a/avahi.spec
+++ b/avahi.spec
@@ -9,8 +9,8 @@
 %endif
 
 Name:           avahi
-Version:        0.6.30
-Release:        7%{?dist}
+Version:        0.6.31
+Release:        1%{?dist}
 Summary:        Local network service discovery
 Group:          System Environment/Base
 License:        LGPLv2
@@ -486,7 +486,8 @@ fi
 %dir %{_datadir}/avahi
 %{_datadir}/avahi/*.dtd
 %{_datadir}/avahi/service-types
-%{_libdir}/avahi
+%dir %{_prefix}/lib/avahi
+%{_prefix}/lib/avahi/service-types.db
 %{_datadir}/dbus-1/interfaces/*.xml
 %{_mandir}/man5/*
 %{_mandir}/man8/avahi-daemon.*
@@ -655,6 +656,9 @@ fi
 %endif
 
 %changelog
+* Tue Feb 14 2012 Lennart Poettering <lpoetter@redhat.com> - 0.6.31-1
+- New upstream release
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.30-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 8ff790c..9d2dfc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4db89a2a403ff4c47d66ac66fad1f43  avahi-0.6.30.tar.gz
+af91abb1886b1c8ff84860ecb27cc1ac  avahi-0.6.31.tar.gz