diff --git a/check_ircd_ssl b/check_ircd_ssl
index 34467d3..7df8a88 100644
--- a/check_ircd_ssl
+++ b/check_ircd_ssl
@@ -1,7 +1,9 @@
-#! /usr/bin/perl -w
+#!@PERL@ -w
 #
+# Copyright (C) 1999 Richard Mayhew <netsaint@splash.co.za>
 # Copyright (C) 2014, SUSE Linux Products GmbH, Nuremberg
-# Author: Lars Vogdt
+# Author:       Richard Mayhew - South Africa
+# rewritten by: Lars Vogdt <lars@linux-schulserver.de>
 #
 # All rights reserved.
 #
@@ -31,12 +33,15 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 #
+# Special thanks to Richard Mayhew for the original plugin written in 
+# 1999/09/20. Some code taken from Charlie Cook (check_disk.pl).
+#
 use Getopt::Long;
 use IO::Socket::INET6;
 use strict;
 use vars qw($PROGNAME $VERSION);
 use vars qw($opt_V $opt_h $opt_t $opt_p $opt_H $opt_w $opt_c $ssl $verbose);
-use lib '/usr/lib/nagios/plugins';
+use lib '@libexecdir@';
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
 # ----------------------------------------------------[ Function Prototypes ]--
@@ -50,7 +55,7 @@ $ENV{BASH_ENV} = '';
 
 # -----------------------------------------------------------------[ Global ]--
 $PROGNAME        = 'check_ircd';
-$VERSION         = '1.5.0';
+$VERSION         = '@NP_VERSION@';
 my $nick         = "ircd$$";
 
 # -------------------------------------------------------------[ print_help ]--
@@ -60,7 +65,7 @@ sub print_help ()
     print "Copyright (c) 2014 SUSE Linux Products GmbH, Nuremberg
 based on the original work of Richard Mayhew/Karl DeBisschop in 2000
 
-Perl Check IRCD plugin for Nagios
+Perl Check IRCD monitoring plugin.
 
 ";
     print_usage();
@@ -171,7 +176,7 @@ MAIN:
     my $hostname;
     Getopt::Long::Configure('bundling');
     GetOptions
-         (	"V"   => \$opt_V,  "version"    => \$opt_V,
+         (  "V"   => \$opt_V,  "version"    => \$opt_V,
             "h"   => \$opt_h,  "help"       => \$opt_h,
             "v"   => \$verbose,"verbose"    => \$verbose,
             "s"   => \$ssl,    "ssl"        => \$ssl,
diff --git a/monitoring-plugins.changes b/monitoring-plugins.changes
index 3a4789b..d2b1ea5 100644
--- a/monitoring-plugins.changes
+++ b/monitoring-plugins.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 21 11:22:54 UTC 2015 - lars@linux-schulserver.de
+
+- use the check_ircd script as submitted via GitHub
+
 -------------------------------------------------------------------
 Sat Dec 27 12:41:01 UTC 2014 - lars@linux-schulserver.de
 
diff --git a/monitoring-plugins.spec b/monitoring-plugins.spec
index 0c7b161..7d42ede 100644
--- a/monitoring-plugins.spec
+++ b/monitoring-plugins.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package monitoring-plugins
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -1043,6 +1043,8 @@ it will provide the size of the queue of age of queue.
 %{__cp} %{S:14} ./README.SUSE-check_icmp
 %{__cp} %{S:15} ./README.SUSE-check_ide_smart
 %{__cp} %{S:20} ./README.SUSE-check_cups
+rm plugins-scripts/check_ircd.pl
+install -m0644 %{S:26} plugins-scripts/check_ircd.pl
 %{__cp} %{S:28} ./README.SUSE-check_ping
 %{__cp} %{S:29} ./README.SUSE-check_ntp_time
 
@@ -1143,10 +1145,6 @@ install -m 644 %{SOURCE23} %{buildroot}%{_sysconfdir}/apparmor.d/
 install -m 644 %{SOURCE24} %{buildroot}%{_sysconfdir}/apparmor.d/
 install -m 644 %{SOURCE25} %{buildroot}%{_sysconfdir}/apparmor.d/
 
-# install new ircd check
-rm %{buildroot}%{nagios_plugindir}/check_ircd
-install -m 755 %{SOURCE26} %{buildroot}%{nagios_plugindir}/check_ircd
-
 # inform the users about the deprecated monitoring-plugins-extras package
 cat >> README.SUSE-deprecated << EOF
 The monitoring-plugins-extras package is deprecated.