diff --git a/build-aux/ax_nagios_get_init b/build-aux/ax_nagios_get_init
index caf3f33d..21a6fa1e 100755
--- a/build-aux/ax_nagios_get_init
+++ b/build-aux/ax_nagios_get_init
@@ -173,7 +173,7 @@ AC_DEFUN([AX_NAGIOS_GET_INIT],
 					if `/sbin/init --version 2>/dev/null | grep "upstart" >/dev/null`; then
 						init_type="upstart"
 						init_type_wanted=no
-					elif test -f "/etc/rc"; then
+					elif test -f "/etc/rc" -a ! -L "/etc/rc"; then
 						init_type="newbsd"
 						init_type_wanted=no
 					else
diff --git a/configure b/configure
index da43256e..7a223cb5 100755
--- a/configure
+++ b/configure
@@ -2963,7 +2963,7 @@ esac
 					if `/sbin/init --version 2>/dev/null | grep "upstart" >/dev/null`; then
 						init_type="upstart"
 						init_type_wanted=no
-					elif test -f "/etc/rc"; then
+					elif test -f "/etc/rc" -a ! -L "/etc/rc"; then
 						init_type="newbsd"
 						init_type_wanted=no
 					else
diff --git a/sample-config/nrpe.cfg.in b/sample-config/nrpe.cfg.in
index f4f7f3a5..dcd26dca 100644
--- a/sample-config/nrpe.cfg.in
+++ b/sample-config/nrpe.cfg.in
@@ -198,35 +198,27 @@ connection_timeout=300
 # If an "or above" version is used, the best will be negotiated. So if both
 # ends are able to do TLSv1.2 and use specify SSLv2, you will get TLSv1.2.
 
-# ssl_version=SSLv2+
-ssl_version=TLSv1+
+#ssl_version=SSLv2+
 
 # SSL USE ADH
 # This is for backward compatibility and is DEPRECATED. Set to 1 to enable
 # ADH or 2 to require ADH. 1 is currently the default but will be changed
 # in a later version.
 
-# ssl_use_adh=1
-# ssl_use_adh=2
+#ssl_use_adh=1
 
 # SSL CIPHER LIST
 # This lists which ciphers can be used. For backward compatibility, this
 # defaults to 'ssl_cipher_list=ALL:!MD5:@STRENGTH' in this version but
 # will be changed to something like the example below in a later version of NRPE.
 
-# ssl_cipher_list=ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
-ssl_cipher_list=ALL:!MD5:@STRENGTH
-# ssl_cipher_list=ADH
-# ssl_cipher_list=ECDH
+#ssl_cipher_list=ALL:!MD5:@STRENGTH
 
 # SSL Certificate and Private Key Files
 
 #ssl_cacert_file=/etc/ssl/servercerts/ca-cert.pem
 #ssl_cert_file=/etc/ssl/servercerts/nagios-cert.pem
 #ssl_privatekey_file=/etc/ssl/servercerts/nagios-key.pem
-ssl_cacert_file=/usr/local/nagios/etc/ssl/ca/ca_cert.pem
-ssl_cert_file=/usr/local/nagios/etc/ssl/server_certs/db_server.pem
-ssl_privatekey_file=/usr/local/nagios/etc/ssl/server_certs/db_server.key
 
 # SSL USE CLIENT CERTS
 # This options determines client certificate usage.
@@ -234,7 +226,7 @@ ssl_privatekey_file=/usr/local/nagios/etc/ssl/server_certs/db_server.key
 #         1 = Ask for client certificates
 #         2 = Require client certificates
 
-ssl_client_certs=2
+#ssl_client_certs=0
 
 # SSL LOGGING
 # This option determines which SSL messages are send to syslog. OR values
@@ -249,7 +241,7 @@ ssl_client_certs=2
 #         0x20 (32) = Log details of client's certificate if it has one
 #         -1 or 0xff or 0x2f = All of the above
 
-ssl_logging=0x2f
+#ssl_logging=0x00
 
 
 
diff --git a/startup/default-init.in b/startup/default-init.in
index 54ae160b..98b573d6 100644
--- a/startup/default-init.in
+++ b/startup/default-init.in
@@ -52,13 +52,6 @@ if [ -f /etc/rc.status ]; then
 	EXIT_CMD="rc_exit"
 	rc_reset
 
-elif [ -f /lib/lsb/init-functions ]; then
-
-	. /lib/lsb/init-functions
-	START_CMD="start_daemon -p $PID_FILE"
-	QSTAT_CMD="pidofproc -p $PID_FILE $NRPE_BIN"
-	PRT_STAT="status_of_proc -p $PID_FILE $NRPE_BIN nrpe"
-
 elif [ -f /etc/rc.d/init.d/functions ]; then
 
 	. /etc/rc.d/init.d/functions
@@ -67,6 +60,13 @@ elif [ -f /etc/init.d/functions ]; then
 
 	. /etc/init.d/functions
 
+elif [ -f /lib/lsb/init-functions ]; then
+
+	. /lib/lsb/init-functions
+	START_CMD="start_daemon -p $PID_FILE"
+	QSTAT_CMD="pidofproc -p $PID_FILE $NRPE_BIN"
+	PRT_STAT="status_of_proc -p $PID_FILE $NRPE_BIN nrpe"
+
 elif [ -f /etc/rc.d/functions ]; then
 
 	. /etc/rc.d/functions
diff --git a/uninstall.in b/uninstall.in
index 83617930..e1dca305 100755
--- a/uninstall.in
+++ b/uninstall.in
@@ -234,7 +234,7 @@ rm_startup () {
 					;;
 				esac
 			}
-			prt_msg 2 0 1 "($INIT_TYPE) Delete $INETD_DIR/$INIT_FILE" && {
+			prt_msg 2 0 1 "($INIT_TYPE) Delete $INIT_DIR/$INIT_FILE" && {
 				rm $force "$INIT_DIR/$INIT_FILE"
 				if test $INIT_TYPE = upstart; then
 					prt_msg 2 0 1 "($INIT_TYPE) initctl reload-configuration" && {