diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e690ddcb62a1f6eb05b2e09b4dd7f0120700972..a9031167ad54a1be700ac830a55a9c1a58268de4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 2.1.1
 
+* Kiss was a class, it is now a module (Kiss::Kiss) to allow for mixins.
+
 ## 2.1.0
 
 * Added a parent interface to KissAbstract called Kiss
diff --git a/lib/kiss/kiss.rb b/lib/kiss/kiss.rb
index 9bc83728d9f2f513d012ec7b77e0bc437780f1a1..c2850eb009258928a3d52e3be0418a467364861e 100644
--- a/lib/kiss/kiss.rb
+++ b/lib/kiss/kiss.rb
@@ -1,7 +1,7 @@
 require 'abstractify'
 
 module Kiss
-  class Kiss
+  module Kiss
     include Abstractify::Abstract
 
     abstract :write_interface, :read_interface, :connect, :close
diff --git a/lib/kiss/kiss_abstract.rb b/lib/kiss/kiss_abstract.rb
index 3e4cd31d5bd238be307966ba34a7cd4ce2aafdf4..9ac88cc125d5be85462ba399cb2bdea9e018fddd 100644
--- a/lib/kiss/kiss_abstract.rb
+++ b/lib/kiss/kiss_abstract.rb
@@ -4,7 +4,8 @@ require 'kiss/constants'
 require 'kiss/kiss'
 
 module Kiss
-    class KissAbstract < Kiss
+    class KissAbstract
+        include Kiss
         include Abstractify::Abstract
 
         abstract :write_interface, :read_interface, :connect, :close