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;