diff --git a/modules/services/unix/irc/irc2/manifests/config.pp b/modules/services/unix/irc/irc2/manifests/config.pp
index b695b652c..cf66fbc7a 100644
--- a/modules/services/unix/irc/irc2/manifests/config.pp
+++ b/modules/services/unix/irc/irc2/manifests/config.pp
@@ -1,4 +1,4 @@
-class irc2::config{
+class irc2::config {
   service { 'ircd-irc2':
     enable => true,
     ensure => 'running',
diff --git a/modules/services/unix/irc/irc2/manifests/install.pp b/modules/services/unix/irc/irc2/manifests/install.pp
index 0c8efb535..8ccd8657c 100644
--- a/modules/services/unix/irc/irc2/manifests/install.pp
+++ b/modules/services/unix/irc/irc2/manifests/install.pp
@@ -1,5 +1,5 @@
-class irc2::install{
-  package { ['ircd-irc2']:
+class irc2::install {
+  package { 'ircd-irc2':
     ensure => 'installed',
   }
 }
diff --git a/modules/services/unix/irc/irc2/secgen_metadata.xml b/modules/services/unix/irc/irc2/secgen_metadata.xml
index cd64acbc6..2fecad5ac 100644
--- a/modules/services/unix/irc/irc2/secgen_metadata.xml
+++ b/modules/services/unix/irc/irc2/secgen_metadata.xml
@@ -19,9 +19,10 @@
   <conflict>
     <type>ircd</type>
   </conflict>
-  <!-- <conflict>
+  <conflict>
+    <!-- install stalls and times out on Stretch -->
     <name>.*Debian.*Stretch.*</name>
-  </conflict> -->
+  </conflict>
   <requires>
     <type>update</type>
   </requires>
diff --git a/modules/services/unix/irc/ircd_hybrid/ircd_hybrid.pp b/modules/services/unix/irc/ircd_hybrid/ircd_hybrid.pp
new file mode 100644
index 000000000..6b07edba1
--- /dev/null
+++ b/modules/services/unix/irc/ircd_hybrid/ircd_hybrid.pp
@@ -0,0 +1,2 @@
+include ircd_hybrid::install
+include ircd_hybrid::config
diff --git a/modules/services/unix/irc/ircd_hybrid/manifests/config.pp b/modules/services/unix/irc/ircd_hybrid/manifests/config.pp
new file mode 100644
index 000000000..2996e601b
--- /dev/null
+++ b/modules/services/unix/irc/ircd_hybrid/manifests/config.pp
@@ -0,0 +1,6 @@
+class ircd_hybrid::config {
+  service { 'ircd-hybrid':
+    enable => true,
+    ensure => 'running',
+  }
+}
diff --git a/modules/services/unix/irc/ircd_hybrid/manifests/install.pp b/modules/services/unix/irc/ircd_hybrid/manifests/install.pp
new file mode 100644
index 000000000..5711c30d4
--- /dev/null
+++ b/modules/services/unix/irc/ircd_hybrid/manifests/install.pp
@@ -0,0 +1,5 @@
+class ircd_hybrid::install {
+  package { 'ircd-hybrid':
+    ensure => 'installed',
+  }
+}
diff --git a/modules/services/unix/irc/ircd_hybrid/secgen_metadata.xml b/modules/services/unix/irc/ircd_hybrid/secgen_metadata.xml
new file mode 100644
index 000000000..c3c0ebb9a
--- /dev/null
+++ b/modules/services/unix/irc/ircd_hybrid/secgen_metadata.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<service xmlns="http://www.github/cliffe/SecGen/service"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://www.github/cliffe/SecGen/service">
+  <name>IRC Server ircd-hybrid</name>
+  <author>Z. Cliffe Schreuders</author>
+  <module_license>MIT</module_license>
+  <description>A lightweight, high-performance internet relay chat daemon.
+  </description>
+
+  <type>ircd</type>
+  <platform>linux</platform>
+
+  <!--optional details-->
+  <software_name>ircd-hybrid</software_name>
+  <software_license>MIT</software_license>
+
+  <conflict>
+    <type>ircd</type>
+  </conflict>
+  <conflict>
+    <!-- install stalls and times out on Kali -->
+    <name>.*Kali.*</name>
+  </conflict>
+  <conflict>
+    <!-- Service start returns 1 on Wheezy -->
+    <name>.*Wheezy.*</name>
+  </conflict>
+  <requires>
+    <type>update</type>
+  </requires>
+</service>
diff --git a/modules/services/unix/irc/ircd_hybrid/secgen_test/ircd_hybrid.rb b/modules/services/unix/irc/ircd_hybrid/secgen_test/ircd_hybrid.rb
new file mode 100644
index 000000000..7761fac90
--- /dev/null
+++ b/modules/services/unix/irc/ircd_hybrid/secgen_test/ircd_hybrid.rb
@@ -0,0 +1,17 @@
+require_relative '../../../../../lib/post_provision_test'
+
+class IRC2Test < PostProvisionTest
+  def initialize
+    self.module_name = 'irc2'
+    self.module_path = get_module_path(__FILE__)
+    super
+    self.port = 6667
+  end
+
+  def test_module
+    super
+    test_service_up
+  end
+end
+
+IRC2Test.new.run
\ No newline at end of file