diff --git a/debian/patches/51_commands.cfg-debianize.patch b/debian/patches/51_commands.cfg-debianize.patch
index 68511a9..9b24f7f 100644
--- a/debian/patches/51_commands.cfg-debianize.patch
+++ b/debian/patches/51_commands.cfg-debianize.patch
@@ -2,6 +2,7 @@ Author: Alexander Wirt <formorer@debian.org>
 Description: Debianize commands.cfg
 --- a/sample-config/template-object/commands.cfg.in
 +++ b/sample-config/template-object/commands.cfg.in
+@@ -2,23 +2,12 @@
  # COMMANDS.CFG - SAMPLE COMMAND DEFINITIONS FOR NAGIOS @VERSION@
  #
  #
diff --git a/debian/patches/52_nagios.cfg-debianize.patch b/debian/patches/52_nagios.cfg-debianize.patch
index b2585f6..d6c30ad 100644
--- a/debian/patches/52_nagios.cfg-debianize.patch
+++ b/debian/patches/52_nagios.cfg-debianize.patch
@@ -1,8 +1,8 @@
 Author: Alexander Wirt <formorer@debian.org>
 Description: Debianize nagios.cfg
---- a/sample-config/nagios.cfg.in
-+++ b/sample-config/nagios.cfg.in
-@@ -16,9 +12,19 @@
+--- a/sample-config/nagios.cfg.in	2017-05-09 19:03:31.000000000 +0200
++++ b/sample-config/nagios.cfg.in	2017-05-20 00:23:49.536000000 +0200
+@@ -15,9 +15,19 @@
  # for historical purposes.  This should be the first option specified 
  # in the config file!!!
  
@@ -23,7 +23,7 @@ Description: Debianize nagios.cfg
  
  # OBJECT CONFIGURATION FILE(S)
  # These are the object configuration files in which you define hosts,
-@@ -27,13 +33,10 @@
+@@ -26,13 +36,10 @@
  # if you wish (as shown below), or keep them all in a single config file.
  
  # You can specify individual object config files as shown below:
@@ -41,7 +41,7 @@ Description: Debianize nagios.cfg
  
  # Definitions for monitoring a Windows machine
  #cfg_file=@sysconfdir@/objects/windows.cfg
-@@ -64,7 +67,7 @@
+@@ -63,7 +70,7 @@
  # directly) in order to prevent inconsistencies that can occur
  # when the config files are modified after Nagios starts.
  
@@ -50,7 +50,7 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -103,7 +106,7 @@
+@@ -102,7 +109,7 @@
  # The contents of the status file are deleted every time Nagios
  #  restarts.
  
@@ -59,7 +59,7 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -140,7 +143,7 @@
+@@ -139,7 +146,7 @@
  # you will have to enable this.
  # Values: 0 = disable commands, 1 = enable commands
  
@@ -68,7 +68,7 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -169,6 +172,8 @@
+@@ -150,6 +157,8 @@
  # is running as (usually 'nobody').  Permissions should be set at the 
  # directory level instead of on the file, as the file is deleted every
  # time its contents are processed.
@@ -77,7 +77,7 @@ Description: Debianize nagios.cfg
  
  command_file=@localstatedir@/rw/nagios.cmd
  
-@@ -198,7 +203,7 @@
+@@ -176,7 +185,7 @@
  # is created, used, and deleted throughout the time that Nagios is
  # running.
  
@@ -86,7 +86,7 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -264,7 +269,7 @@
+@@ -242,7 +251,7 @@
  # This is the directory where archived (rotated) log files should be 
  # placed (assuming you've chosen to do log rotation).
  
@@ -95,7 +95,7 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -1112,7 +1117,7 @@
+@@ -1091,7 +1100,7 @@
  #	strict-iso8601	(YYYY-MM-DDTHH:MM:SS)
  #
  
@@ -104,7 +104,7 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -1226,8 +1231,8 @@
+@@ -1176,8 +1185,8 @@
  # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
  # commands.
  
@@ -115,7 +115,7 @@ Description: Debianize nagios.cfg
  
  
  
-@@ -1334,7 +1339,7 @@
+@@ -1287,7 +1296,7 @@
  # DEBUG FILE
  # This option determines where Nagios should write debugging information.
  
diff --git a/debian/patches/55_strip_logarchivepath.patch b/debian/patches/55_strip_logarchivepath.patch
index abfceed..4f323c3 100644
--- a/debian/patches/55_strip_logarchivepath.patch
+++ b/debian/patches/55_strip_logarchivepath.patch
@@ -2,7 +2,7 @@ Author: Omni Flux <omniflux@omniflux.com>
 Description: stripping the log_archive_path value from cgi.cfg (#578232) 
 --- a/cgi/cgiutils.c
 +++ b/cgi/cgiutils.c
-@@ -500,7 +500,7 @@
+@@ -511,7 +511,7 @@
  			temp_buffer = strtok(NULL, "\n");
  			strncpy(log_archive_path, (temp_buffer == NULL) ? "" : temp_buffer, sizeof(log_archive_path));
  			log_archive_path[sizeof(log_archive_path) - 1] = '\x0';