diff --git a/lib/fog/openstack/models/compute/server.rb b/lib/fog/openstack/models/compute/server.rb
index 7d63fc3ecd..53158298c9 100644
--- a/lib/fog/openstack/models/compute/server.rb
+++ b/lib/fog/openstack/models/compute/server.rb
@@ -20,6 +20,7 @@ class Server < Fog::Compute::Server
         attribute :progress
         attribute :accessIPv4
         attribute :accessIPv6
+        attribute :availability_zone
         attribute :state,       :aliases => 'status'
 
         attr_reader :password
@@ -153,7 +154,8 @@ def save
             'metadata'    => meta_hash,
             'personality' => personality,
             'accessIPv4' => accessIPv4,
-            'accessIPv6' => accessIPv6
+            'accessIPv6' => accessIPv6,
+            'availability_zone' => availability_zone
           }
           options = options.reject {|key, value| value.nil?}
           data = connection.create_server(name, image_ref, flavor_ref, options)
diff --git a/lib/fog/openstack/requests/compute/create_server.rb b/lib/fog/openstack/requests/compute/create_server.rb
index 957407b0ef..b5bc882763 100644
--- a/lib/fog/openstack/requests/compute/create_server.rb
+++ b/lib/fog/openstack/requests/compute/create_server.rb
@@ -30,6 +30,9 @@ def create_server(name, image_ref, flavor_ref, options = {})
               }
             end
           end
+          if options['availability_zone']
+            data['server']['availability_zone'] = options['availability_zone']
+          end
           request(
             :body     => MultiJson.encode(data),
             :expects  => [200, 202],