diff --git a/amanda-3.1.0-example.patch b/amanda-3.1.0-example.patch
deleted file mode 100644
index ee9ea2c..0000000
--- a/amanda-3.1.0-example.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up amanda-3.1.0/example/Makefile.am.example amanda-3.1.0/example/Makefile.am
---- amanda-3.1.0/example/Makefile.am.example	2010-06-01 21:21:59.000000000 +0200
-+++ amanda-3.1.0/example/Makefile.am	2010-06-23 15:53:42.693848261 +0200
-@@ -4,9 +4,9 @@ include $(top_srcdir)/config/automake/va
- 
- amanda_dir    = $(amdatadir)
- templatedir   = $(amanda_dir)/template.d
--server_exampledir    = $(amanda_dir)/example
--client_exampledir    = $(amanda_dir)/example
--lbltempldir   = $(amanda_dir)/example/label-templates
-+server_exampledir    = $(sysconfdir)/amanda/example
-+client_exampledir    = $(sysconfdir)/amanda/example
-+lbltempldir   = $(sysconfdir)/amanda/example/label-templates
- 
- template_in_FILE = \
- 		template.d/advanced.conf.in \
diff --git a/amanda.spec b/amanda.spec
index 09d52d9..04bb4f7 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -14,7 +14,6 @@ Source1: amanda.crontab
 Source4: disklist
 Source5: amanda-xinetd
 Source8: amandahosts
-Patch1: amanda-3.1.0-example.patch
 Patch2: amanda-3.1.1-xattrs.patch
 Patch3: amanda-3.1.1-tcpport.patch
 Patch6: amanda-3.2.0-config-dir.patch
@@ -78,7 +77,6 @@ server also needs to have the amanda-client package installed.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .example
 %patch2 -p1 -b .xattrs
 %patch3 -p1 -b .tcpport
 %patch6 -p1 -b .config
@@ -120,6 +118,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 make install BINARY_OWNER=%(id -un) SETUID_GROUP=%(id -gn) DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT/etc/amanda
 mkdir -p $RPM_BUILD_ROOT/etc/xinetd.d
 cp %SOURCE5 $RPM_BUILD_ROOT/etc/xinetd.d/amanda
 chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amanda
@@ -131,7 +130,7 @@ ln -s %{_libexecdir}/amanda/amandad $RPM_BUILD_ROOT%{_sbindir}/amandad
 ln -s amrecover.8.gz $RPM_BUILD_ROOT%{_mandir}/man8/amoldrecover.8
 
 pushd ${RPM_BUILD_ROOT}
-  mv .%{_sysconfdir}/amanda/example .%{_sysconfdir}/amanda/%defconfig
+  mv .%{_localstatedir}/lib/amanda/example .%{_sysconfdir}/amanda/%defconfig
   cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample
   cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
   cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
@@ -434,6 +433,7 @@ rm -rf ${RPM_BUILD_ROOT}
 - upgrade to new upstream release
 - uses bsdtcp authentication by default
 - dropped amanda-3.1.1-bsd.patch
+- modified example directory handling and dropped amanda-3.1.0-example.patch
 
 * Wed May 4 2011 Jan Görig <jgorig@redhat.com> - 3.3.0-0.1.beta1
 - update to new upstream beta release