diff --git a/debian/patches/50_disable_epn b/debian/patches/50_disable_epn
index 8b51cd6..5b44be7 100644
--- a/debian/patches/50_disable_epn
+++ b/debian/patches/50_disable_epn
@@ -2,115 +2,115 @@
##
## DP: leave marks to disable epn
---- a/check_snmp_boostedge.pl
-+++ b/check_snmp_boostedge.pl
+--- a/plugins/check_snmp_boostedge.pl
++++ b/plugins/check_snmp_boostedge.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_boostedge.pl #################
# Version : 1.0
# Date : Jan 16 2007
---- a/check_snmp_cpfw.pl
-+++ b/check_snmp_cpfw.pl
+--- a/plugins/check_snmp_cpfw.pl
++++ b/plugins/check_snmp_cpfw.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_cpfw ##############
- my $Version='1.8';
- # Date : Oct 20 2007
---- a/check_snmp_css_main.pl
-+++ b/check_snmp_css_main.pl
+ my $VERSION = "2.0.0";
+
+--- a/plugins/check_snmp_css_main.pl
++++ b/plugins/check_snmp_css_main.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_css_main.pl #################
- # Version : 1.0
+ # Version : 1.0
# Date : 27 Sept 2006
---- a/check_snmp_css.pl
-+++ b/check_snmp_css.pl
+--- a/plugins/check_snmp_css.pl
++++ b/plugins/check_snmp_css.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_css.pl #################
# Version : 1.0.1
# Date : 27 Sept 2006
---- a/check_snmp_env.pl
-+++ b/check_snmp_env.pl
+--- a/plugins/check_snmp_env.pl
++++ b/plugins/check_snmp_env.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_env #################
# Version : 1.3
# Date : May 24 2007
---- a/check_snmp_int.pl
-+++ b/check_snmp_int.pl
+--- a/plugins/check_snmp_int.pl
++++ b/plugins/check_snmp_int.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_int ##############
- my $Version='1.24';
- # Date : Oct 10 2007
---- a/check_snmp_linkproof_nhr.pl
-+++ b/check_snmp_linkproof_nhr.pl
+ my $VERSION = "2.0.0";
+
+--- a/plugins/check_snmp_linkproof_nhr.pl
++++ b/plugins/check_snmp_linkproof_nhr.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_linkproof_nhr #################
# Version : 1.0
# Date : Aug 24 2006
---- a/check_snmp_load.pl
-+++ b/check_snmp_load.pl
+--- a/plugins/check_snmp_load.pl
++++ b/plugins/check_snmp_load.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_load #################
- my $Version='1.12';
- # Date : Oct 12 2007
---- a/check_snmp_mem.pl
-+++ b/check_snmp_mem.pl
+ my $VERSION = "2.0.0";
+
+--- a/plugins/check_snmp_mem.pl
++++ b/plugins/check_snmp_mem.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_mem ##############
- my $Version='1.5';
- # Date : 17 October 2007
---- a/check_snmp_nsbox.pl
-+++ b/check_snmp_nsbox.pl
+ my $VERSION = "2.0.0";
+
+--- a/plugins/check_snmp_nsbox.pl
++++ b/plugins/check_snmp_nsbox.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_nsbox #################
# Version : 1.0
# Date : Jan 16 2007
---- a/check_snmp_process.pl
-+++ b/check_snmp_process.pl
+--- a/plugins/check_snmp_process.pl
++++ b/plugins/check_snmp_process.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_process ##############
- my $Version='1.10';
- # Date : Oct 12 2007
---- a/check_snmp_storage.pl
-+++ b/check_snmp_storage.pl
+ my $VERSION = "2.0.0";
+
+--- a/plugins/check_snmp_storage.pl
++++ b/plugins/check_snmp_storage.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_storage ##############
# Version : 1.3.3
# Date : Jun 1 2007
---- a/check_snmp_vrrp.pl
-+++ b/check_snmp_vrrp.pl
+--- a/plugins/check_snmp_vrrp.pl
++++ b/plugins/check_snmp_vrrp.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_vrrp ##############
- my $Version='1.4';
- # Date : Oct 17 2007
---- a/check_snmp_win.pl
-+++ b/check_snmp_win.pl
+ my $VERSION = "2.0.0";
+
+--- a/plugins/check_snmp_win.pl
++++ b/plugins/check_snmp_win.pl
@@ -1,4 +1,5 @@
#!/usr/bin/perl -w
+# nagios: -epn
############################## check_snmp_win ##############
- my $Version='1.1';
- # Date : Oct 12 2007
+ my $VERSION = "2.0.0";
+
diff --git a/debian/patches/51_fix_privacy_doc b/debian/patches/51_fix_privacy_doc
index 4b4e5ec..7592e85 100644
--- a/debian/patches/51_fix_privacy_doc
+++ b/debian/patches/51_fix_privacy_doc
@@ -8,20 +8,18 @@ Date: Sun Mar 2 21:22:42 2014 +0100
Fix potential privacy breach of HTML documentation
---- a/doc/faq.html
-+++ b/doc/faq.html
-@@ -225,7 +225,7 @@
- |
- This project is also hosted by :
-
-- 
-+ http://sourceforge.net/projects/nagios-snmp
- |
-
-
---- a/doc/index.html
-+++ b/doc/index.html
-@@ -324,7 +324,7 @@
+--- a/plugins/doc/index.html
++++ b/plugins/doc/index.html
+@@ -83,7 +83,7 @@
+ ----------- |
+
+
+- 
++ | http://sourceforge.net/projects/nagios-snmp
+ |
+
+
+@@ -417,7 +417,7 @@
This project is hosted on :
@@ -30,8 +28,19 @@ Date: Sun Mar 2 21:22:42 2014 +0100
Nagios and the Nagios logo are registered
trademarks of Ethan Galstad.
---- a/doc/index_commands.html
-+++ b/doc/index_commands.html
+--- a/plugins/doc/faq.html
++++ b/plugins/doc/faq.html
+@@ -236,7 +236,7 @@
+ |
+ This project is also hosted by :
+
+-
++ http://sourceforge.net/projects/nagios-snmp
+ |
+
+
+--- a/plugins/doc/index_commands.html
++++ b/plugins/doc/index_commands.html
@@ -109,7 +109,7 @@
@@ -50,8 +59,8 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_cpfw.html
-+++ b/doc/snmp_cpfw.html
+--- a/plugins/doc/snmp_cpfw.html
++++ b/plugins/doc/snmp_cpfw.html
@@ -439,7 +439,7 @@
This project is hosted on :
@@ -61,8 +70,8 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_css.html
-+++ b/doc/snmp_css.html
+--- a/plugins/doc/snmp_css.html
++++ b/plugins/doc/snmp_css.html
@@ -353,7 +353,7 @@
This project is hosted on :
@@ -72,8 +81,8 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_env.html
-+++ b/doc/snmp_env.html
+--- a/plugins/doc/snmp_env.html
++++ b/plugins/doc/snmp_env.html
@@ -342,7 +342,7 @@
This project is hosted on :
@@ -83,9 +92,9 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_int.html
-+++ b/doc/snmp_int.html
-@@ -660,7 +660,7 @@
+--- a/plugins/doc/snmp_int.html
++++ b/plugins/doc/snmp_int.html
+@@ -643,7 +643,7 @@
This project is hosted on :
@@ -94,8 +103,8 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_load.html
-+++ b/doc/snmp_load.html
+--- a/plugins/doc/snmp_load.html
++++ b/plugins/doc/snmp_load.html
@@ -379,7 +379,7 @@
This project is hosted on :
@@ -105,8 +114,8 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_mem.html
-+++ b/doc/snmp_mem.html
+--- a/plugins/doc/snmp_mem.html
++++ b/plugins/doc/snmp_mem.html
@@ -457,7 +457,7 @@
This project is hosted on :
@@ -116,9 +125,9 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_process.html
-+++ b/doc/snmp_process.html
-@@ -332,7 +332,7 @@
+--- a/plugins/doc/snmp_process.html
++++ b/plugins/doc/snmp_process.html
+@@ -355,7 +355,7 @@
|
This project is hosted on :
@@ -127,9 +136,9 @@ Date: Sun Mar 2 21:22:42 2014 +0100
Nagios and the Nagios logo are registered
trademarks of Ethan Galstad.
---- a/doc/snmp_storage.html
-+++ b/doc/snmp_storage.html
-@@ -1285,7 +1285,7 @@
+--- a/plugins/doc/snmp_storage.html
++++ b/plugins/doc/snmp_storage.html
+@@ -1272,7 +1272,7 @@
@@ -138,8 +147,8 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_vrrp.html
-+++ b/doc/snmp_vrrp.html
+--- a/plugins/doc/snmp_vrrp.html
++++ b/plugins/doc/snmp_vrrp.html
@@ -324,7 +324,7 @@
This project is hosted on :
@@ -149,8 +158,8 @@ Date: Sun Mar 2 21:22:42 2014 +0100
---- a/doc/snmp_windows.html
-+++ b/doc/snmp_windows.html
+--- a/plugins/doc/snmp_windows.html
++++ b/plugins/doc/snmp_windows.html
@@ -243,7 +243,7 @@
|
|
|