diff --git a/amanda-udp.service b/amanda-udp.service
index 1054252..e749c81 100644
--- a/amanda-udp.service
+++ b/amanda-udp.service
@@ -5,5 +5,5 @@ After=local-fs.target
 [Service]
 User=amandabackup
 Group=disk
-ExecStart=/usr/sbin/amandad -auth=bsd amdump 
+ExecStart=/usr/sbin/amandad -auth=bsd amdump amindexd amidxtaped
 StandardInput=socket
diff --git a/amanda.spec b/amanda.spec
index 0d57247..20c95fd 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -10,7 +10,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 3.3.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 Source: http://downloads.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -470,6 +470,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Nov 11 2014 Petr Hracek <phracek@redhat.com> - 3.3.6-4
+- Resolves #1033896 - add amindexd as argument to amandad
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/amanda@.service b/amanda@.service
index 24adab4..dd94de8 100644
--- a/amanda@.service
+++ b/amanda@.service
@@ -5,5 +5,5 @@ After=local-fs.target
 [Service]
 User=amandabackup
 Group=disk
-ExecStart=/usr/sbin/amandad -auth=bsdtcp amdump 
+ExecStart=/usr/sbin/amandad -auth=bsdtcp amdump amindexd amidxtaped
 StandardInput=socket