diff --git a/.gitignore b/.gitignore
index 6fc4134..6013e57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 netatalk-2.1.3.tar.bz2
 /netatalk-2.1.4.tar.bz2
 /netatalk-2.1.5.tar.bz2
+/netatalk-2.2.0.tar.bz2
diff --git a/netatalk.spec b/netatalk.spec
index c0ca098..fa1bffe 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -1,7 +1,7 @@
 Summary: Daemon which provides POSIX-compliant *NIX/*BSD systems with the ability to share files and printers with Apple Macintosh
 Name:    netatalk
-Version: 2.1.5
-Release: 2%{?dist}
+Version: 2.2.0
+Release: 1%{?dist}
 Epoch:   4
 License: GPLv2+
 Group:   System Environment/Daemons
@@ -71,7 +71,8 @@ export CFLAGS="$CFLAGS -fsigned-char"
         --enable-krbV-uam \
         --enable-overwrite \
         --with-gnu-ld \
-	--enable-redhat
+	--enable-redhat \
+        --with-libgcrypt
 
 # Grrrr. Fix broken libtool/autoFOO Makefiles.
 if [ "%{_lib}" != lib ]; then
@@ -94,17 +95,17 @@ cp -fp config/afpd.conf config.example
 cp -fp config/AppleVolumes.system config.example
 cp -fp config/AppleVolumes.default config.example
 cp -fp config/atalkd.conf config.example
+cp -fp config/atalkd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk
 cp -fp config/netatalk.conf config.example
 cp -fp config/papd.conf config.example
+cp -fp config/papd.conf $RPM_BUILD_ROOT%{_sysconfdir}/netatalk
+mkdir -p $RPM_BUILD_ROOT/usr/share/netatalk
+cp -fp etc/psf/pagecount.ps $RPM_BUILD_ROOT/usr/share/netatalk
 
 cp -fp %{SOURCE2} config.example
 # XXX bad hack until this file is updated in glibc-headers:
 rm -f $RPM_BUILD_ROOT/usr/include/netatalk/at.h
 
-# Fix up ICDumpSuffixMap
-sed -e 's/\r/\n/' -e 's:#!perl:#!%{__perl}:' contrib/ICDumpSuffixMap > ICDumpSuffixMap
-touch -r contrib/ICDumpSuffixMap ICDumpSuffixMap
-
 # Clean up .a and .la files
 find $RPM_BUILD_ROOT -name \*.a -exec rm {} \;
 find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;
@@ -133,8 +134,8 @@ fi
 
 %files
 %defattr(-,root,root)
-%doc COPYRIGHT COPYING ChangeLog README* TODO VERSION NEWS 
-%doc ICDumpSuffixMap doc
+%doc COPYRIGHT COPYING ChangeLog VERSION NEWS 
+%doc doc
 %doc config.example
 %dir %{_sysconfdir}/netatalk
 %attr(755,root,root) %{_initrddir}/netatalk
@@ -153,7 +154,6 @@ fi
 %{_datadir}/netatalk
 %dir %{_libdir}/atalk
 %{_libdir}/atalk/*.so
-%{_libexecdir}/*
 
 %files devel
 %defattr(-,root,root)
@@ -167,6 +167,9 @@ fi
 %{_mandir}/man*/netatalk-config.1*
 
 %changelog
+* Fri Jul 29 2011 Jiri Skala <jskala@redhat.com> - 4:2.2.0-1
+- update to latest upstream netatalk-2.2.0
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4:2.1.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index f075345..0022dbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2495f832643cef131bc3032274fbf926  netatalk-2.1.5.tar.bz2
+acac2b5f2d9f43bfd5ea2a5cf4c71fe5  netatalk-2.2.0.tar.bz2