diff --git a/amanda-3.4-fix-dependencies.diff b/amanda-3.4-fix-dependencies.diff
new file mode 100644
index 0000000..0606673
--- /dev/null
+++ b/amanda-3.4-fix-dependencies.diff
@@ -0,0 +1,38 @@
+diff --git a/perl/Amanda/DB.pm b/perl/Amanda/DB.pm
+index 4a1aaec..29b6acf 100644
+--- a/perl/Amanda/DB.pm
++++ b/perl/Amanda/DB.pm
+@@ -18,6 +18,8 @@
+ # Contact information: Zmanda Inc, 505 N Mathlida Ave, Suite 120
+ # Sunnyvale, CA 94085, or: http://www.zmanda.com
+ 
++package Amanda::DB;
++
+ package Amanda::DB::Message;
+ use strict;
+ use warnings;
+diff --git a/perl/Amanda/Recovery.pm b/perl/Amanda/Recovery.pm
+index 33fb43b..cf43334 100644
+--- a/perl/Amanda/Recovery.pm
++++ b/perl/Amanda/Recovery.pm
+@@ -18,6 +18,8 @@
+ # Contact information: Carbonite Inc., 756 N Pastoria Ave
+ # Sunnyvale, CA 94085, or: http://www.zmanda.com
+ 
++package Amanda::Recovery;
++
+ package Amanda::Recovery::Message;
+ use strict;
+ use warnings;
+diff --git a/perl/Amanda/Service.pm b/perl/Amanda/Service.pm
+index 09d8c56..24a773e 100644
+--- a/perl/Amanda/Service.pm
++++ b/perl/Amanda/Service.pm
+@@ -17,6 +17,7 @@
+ # Contact information: Carbonite Inc., 756 N Pastoria Ave
+ # Sunnyvale, CA 94085, or: http://www.zmanda.com
+ 
++package Amanda::Service;
+ 
+ package Amanda::Service::Message;
+ use strict;
diff --git a/amanda.spec b/amanda.spec
index 46241f1..ed37d02 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -28,6 +28,8 @@ Patch2:        amanda-3.1.1-tcpport.patch
 Patch3:        amanda-3.2.0-config-dir.patch
 #Bugfix - solved problem with permission error message (#1257686)
 Patch4:        amanda-3.3.9-hash-permission.patch
+#Fix broken dependencies in amanda-3.4
+Patch5:        amanda-3.4-fix-dependencies.diff
 
 License:       BSD and GPLv3+ and GPLv2+ and GPLv2
 Group:         Applications/System
@@ -113,6 +115,7 @@ server also needs to have the amanda-client package installed.
 %patch2 -p1 -b .tcpport
 %patch3 -p1 -b .config
 %patch4 -p1 -b .hash-permission
+%patch5 -p1 -b .fix-dependencies
 ./autogen
 
 %build
@@ -530,6 +533,9 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Wed Oct 26 2016 Josef Ridky <jridky@redhat.com> - 3.4-3
+- Upstream fix of broken dependencies
+
 * Mon Oct 24 2016 Josef Ridky <jridky@redhat.com> - 3.4-2
 - Add Requires for server package