diff --git a/lib/database.rb b/lib/database.rb
index ec9c3f5..b608b9e 100644
--- a/lib/database.rb
+++ b/lib/database.rb
@@ -66,8 +66,8 @@ class CouchRest
       result = {}
       attachments.each do |k,v|
         result[k] = {
-          "type" => "base64",
-          "data" => base64(v)
+          "type" => v['type'],
+          "data" => base64(v['data'])
         }
       end
       result
diff --git a/spec/database_spec.rb b/spec/database_spec.rb
index dd850a7..e1d37e8 100644
--- a/spec/database_spec.rb
+++ b/spec/database_spec.rb
@@ -190,7 +190,10 @@ describe CouchRest::Database do
         "_id" => "mydocwithattachment",
         "field" => ["some value"],
         "_attachments" => {
-          "test.html" => @attach
+          "test.html" => {
+            "type" => "text/html",
+            "data" => @attach
+          }
         }
       }
       @db.save(@doc)
@@ -211,7 +214,10 @@ describe CouchRest::Database do
       @doc = {
         "field" => ["some other value"],
         "_attachments" => {
-          "http://example.com/stuff.cgi?things=and%20stuff" => @attach
+          "http://example.com/stuff.cgi?things=and%20stuff" => {
+            "type" => "text/html",
+            "data" => @attach
+          }
         }
       }
       @docid = @db.save(@doc)['id']