diff --git a/Netdisco/Changes b/Netdisco/Changes
index 454c69d8..2278ebd1 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -14,6 +14,7 @@
   [BUG FIXES]
 
   * Suggest installation of perl-core RPM (arguably Red Hat's bug not ours!)
+  * FATAL warnings considered harmful
 
 2.024004 - 2014-03-04
 
diff --git a/Netdisco/bin/netdisco-daemon b/Netdisco/bin/netdisco-daemon
index 9767c551..066843f3 100755
--- a/Netdisco/bin/netdisco-daemon
+++ b/Netdisco/bin/netdisco-daemon
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 
diff --git a/Netdisco/bin/netdisco-daemon-fg b/Netdisco/bin/netdisco-daemon-fg
index 783932aa..7009f841 100755
--- a/Netdisco/bin/netdisco-daemon-fg
+++ b/Netdisco/bin/netdisco-daemon-fg
@@ -1,5 +1,8 @@
 #!/usr/bin/env perl
 
+use strict;
+use warnings;
+
 use FindBin;
 FindBin::again();
 use Path::Class 'dir';
diff --git a/Netdisco/bin/netdisco-web b/Netdisco/bin/netdisco-web
index f1c6e693..9a197291 100755
--- a/Netdisco/bin/netdisco-web
+++ b/Netdisco/bin/netdisco-web
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 our $home = ($ENV{NETDISCO_HOME} || $ENV{HOME});
 
diff --git a/Netdisco/bin/netdisco-web-fg b/Netdisco/bin/netdisco-web-fg
index e82e1c78..de83321a 100755
--- a/Netdisco/bin/netdisco-web-fg
+++ b/Netdisco/bin/netdisco-web-fg
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 BEGIN {
   if ($ENV{_} and $ENV{_} =~ m/netdisco-web-fg$/) {
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index bb7c8abf..ea875fd0 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -1,7 +1,7 @@
 package App::Netdisco;
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 use 5.010_000;
 
 our $VERSION = '2.024004';
diff --git a/Netdisco/lib/App/Netdisco/DB/ExplicitLocking.pm b/Netdisco/lib/App/Netdisco/DB/ExplicitLocking.pm
index 9925f2fd..4303f612 100644
--- a/Netdisco/lib/App/Netdisco/DB/ExplicitLocking.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ExplicitLocking.pm
@@ -1,7 +1,7 @@
 package App::Netdisco::DB::ExplicitLocking;
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 our %lock_modes;
 
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Admin.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Admin.pm
index 30d7a4fe..1d7d8bec 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Admin.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Admin.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::Admin;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
index 20e7d898..66eaa0cf 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::Device;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 use NetAddr::IP::Lite ':lower';
 
 =head1 ADDITIONAL METHODS
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DeviceModule.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/DeviceModule.pm
index 3d14a19d..8a97c466 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/DeviceModule.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/DeviceModule.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::DeviceModule;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 =head1 ADDITIONAL METHODS
 
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm
index 5b58ee8f..91ee2682 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePort.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::DevicePort;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm
index c631f1be..6a85c412 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortLog.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::DevicePortLog;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm
index bfbbfd37..c2c722fd 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/DevicePortSsid.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::DevicePortSsid;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(
     qw/
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm
index 39fad973..3da9fe9c 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Node.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::Node;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm
index dfadd8f7..3557de7e 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeIp.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::NodeIp;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeNbt.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeNbt.pm
index ef2a13b5..df1a3071 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeNbt.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeNbt.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::NodeNbt;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeWireless.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeWireless.pm
index a4288ebf..4cb457eb 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeWireless.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/NodeWireless.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::NodeWireless;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Subnet.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Subnet.pm
index d604382c..5453103e 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Subnet.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Subnet.pm
@@ -2,7 +2,7 @@ package App::Netdisco::DB::ResultSet::Subnet;
 use base 'App::Netdisco::DB::ResultSet';
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 __PACKAGE__->load_components(qw/
   +App::Netdisco::DB::ExplicitLocking
diff --git a/Netdisco/lib/App/Netdisco/Environment.pm b/Netdisco/lib/App/Netdisco/Environment.pm
index 210b2b5e..4f58343a 100644
--- a/Netdisco/lib/App/Netdisco/Environment.pm
+++ b/Netdisco/lib/App/Netdisco/Environment.pm
@@ -1,7 +1,7 @@
 package App::Netdisco::Environment;
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 use File::ShareDir 'dist_dir';
 use Path::Class;
diff --git a/Netdisco/lib/App/Netdisco/Util/DNS.pm b/Netdisco/lib/App/Netdisco/Util/DNS.pm
index f4bca5e7..156044e0 100644
--- a/Netdisco/lib/App/Netdisco/Util/DNS.pm
+++ b/Netdisco/lib/App/Netdisco/Util/DNS.pm
@@ -1,7 +1,7 @@
 package App::Netdisco::Util::DNS;
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 use Dancer ':script';
 use Net::DNS;
diff --git a/Netdisco/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm b/Netdisco/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
index 376899bb..dfd5d461 100644
--- a/Netdisco/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Auth/Provider/DBIC.pm
@@ -1,7 +1,7 @@
 package App::Netdisco::Web::Auth::Provider::DBIC;
 
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 use base 'Dancer::Plugin::Auth::Extensible::Provider::Base';