diff --git a/lib/linux_admin.rb b/lib/linux_admin.rb
index efc46b5..1a6c061 100644
--- a/lib/linux_admin.rb
+++ b/lib/linux_admin.rb
@@ -34,11 +34,12 @@
 
 module LinuxAdmin
   extend Common
-  extend self
 
-  attr_writer :logger
+  class << self
+    attr_writer :logger
+  end
 
-  def logger
+  def self.logger
     @logger ||= NullLogger.new
   end
 end
diff --git a/lib/linux_admin/common.rb b/lib/linux_admin/common.rb
index 4a157fc..0888ce5 100644
--- a/lib/linux_admin/common.rb
+++ b/lib/linux_admin/common.rb
@@ -2,6 +2,8 @@
 
 module LinuxAdmin
   module Common
+    include Logging
+
     BIN_DIRS = %w(/bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin)
 
     def cmd(name)
diff --git a/lib/linux_admin/rpm.rb b/lib/linux_admin/rpm.rb
index 340f02f..79fe48b 100644
--- a/lib/linux_admin/rpm.rb
+++ b/lib/linux_admin/rpm.rb
@@ -1,7 +1,5 @@
 module LinuxAdmin
   class Rpm < Package
-    extend Logging
-
     def self.rpm_cmd
       cmd(:rpm)
     end