diff --git a/.gitignore b/.gitignore
index 77005cf..49f5933 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bitlbee-1.2.8.tar.gz
+/bitlbee-3.0.tar.gz
diff --git a/bitlbee.spec b/bitlbee.spec
index 9f242ae..4afe454 100644
--- a/bitlbee.spec
+++ b/bitlbee.spec
@@ -1,6 +1,6 @@
 Summary:           IRC to other chat networks gateway
 Name:              bitlbee
-Version:           1.2.8
+Version:           3.0
 Release:           1%{?dist}
 License:           GPLv2+ and MIT
 Group:             System Environment/Daemons
@@ -8,7 +8,7 @@ URL:               http://www.bitlbee.org/
 Source0:           http://get.bitlbee.org/src/%{name}-%{version}.tar.gz
 Source1:           bitlbee.xinetd
 Source2:           bitlbee-wrapper.h
-Patch0:            bitlbee-1.2.7-libresolv.patch
+#Patch0:            bitlbee-1.2.7-libresolv.patch
 Patch1:            bitlbee-1.2.8-strtoll.patch
 Requires:          xinetd
 Requires(pre):     shadow-utils
@@ -39,7 +39,7 @@ developing programs and plugins which use bitlbee.
 %prep
 %setup -q
 %if 0%{?fedora}%{?rhel} < 6
-%patch0 -p1 -b .libresolv
+#%patch0 -p1 -b .libresolv
 %patch1 -p1 -b .strtoll
 %endif
 
@@ -75,7 +75,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall install-dev
+%makeinstall install-dev install-etc
 
 # Install some files manually to their correct destination
 mkdir -p $RPM_BUILD_ROOT{%{_localstatedir}/lib,%{_libdir}}/%{name}
@@ -115,7 +115,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
 %doc doc/user-guide/*.xml doc/user-guide/user-guide.txt
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
+%config(noreplace) %{_sysconfdir}/%{name}/
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
 %{_sbindir}/%{name}
 %{_libdir}/%{name}/
@@ -130,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Fri Oct 22 2010 Matěj Cepl <mcepl@redhat.com> - 3.0-1
+- New upstream release.
+
 * Sun Jul 04 2010 Robert Scheck <robert@fedoraproject.org> 1.2.8-1
 - Upgrade to 1.2.8
 
diff --git a/sources b/sources
index 331f529..1818830 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1fbbd9d96ec7c2377b1b286689c1b83  bitlbee-1.2.8.tar.gz
+455fc8070d758c2bb3442ef4c709ad69  bitlbee-3.0.tar.gz