diff --git a/lib/linux_admin/disk.rb b/lib/linux_admin/disk.rb
index 13c9386..a53fa89 100644
--- a/lib/linux_admin/disk.rb
+++ b/lib/linux_admin/disk.rb
@@ -53,7 +53,7 @@ def check_if_partitions_overlap(partitions)
     public
 
     def self.local
-      Dir.glob('/dev/[vhs]d[a-z]').collect do |d|
+      Dir.glob(['/dev/[vhs]d[a-z]', '/dev/xvd[a-z]']).collect do |d|
         Disk.new :path => d
       end
     end
diff --git a/spec/disk_spec.rb b/spec/disk_spec.rb
index c9826b1..5e9c61d 100644
--- a/spec/disk_spec.rb
+++ b/spec/disk_spec.rb
@@ -3,7 +3,7 @@
 describe LinuxAdmin::Disk do
   describe "#local" do
     it "returns local disks" do
-      Dir.should_receive(:glob).with('/dev/[vhs]d[a-z]').
+      Dir.should_receive(:glob).with(['/dev/[vhs]d[a-z]', '/dev/xvd[a-z]']).
           and_return(['/dev/hda', '/dev/sda'])
       disks = LinuxAdmin::Disk.local
       paths = disks.collect { |disk| disk.path }