diff --git a/lib/puppet_bind/provider/nsupdate.rb b/lib/puppet_bind/provider/nsupdate.rb
index c37a72d..8d3a7ef 100644
--- a/lib/puppet_bind/provider/nsupdate.rb
+++ b/lib/puppet_bind/provider/nsupdate.rb
@@ -60,16 +60,28 @@ module PuppetBind
 
       def accio(file)
         rrdata_adds.each do |datum|
-          file.write "update add #{name}. #{resource[:ttl]} #{rrclass} #{type} #{datum}\n"
+          file.write "update add #{name}. #{resource[:ttl]} #{rrclass} #{type} #{maybe_quote(type, datum)}\n"
         end
       end
 
       def destructo(file)
         rrdata_deletes.each do |datum|
-          file.write "update delete #{name}. #{ttl} #{rrclass} #{type} #{datum}\n"
+          file.write "update delete #{name}. #{ttl} #{rrclass} #{type} #{maybe_quote(type, datum)}\n"
         end
       end
 
+      def quoted_type?(type)
+        %(TXT SPF).include?(type)
+      end
+
+      def maybe_quote(type, datum)
+        quoted_type?(type) ? "\"#{datum}\"" : datum
+      end
+
+      def maybe_unquote(type, datum)
+        quoted_type?(type) ? datum.gsub(/^\"(.*)\"$/, '\1') : datum
+      end
+
       def rrdata_adds
         newdata - rrdata
       end
@@ -124,7 +136,7 @@ module PuppetBind
               :ttl     => linearray[1],
               :rrclass => linearray[2],
               :type    => linearray[3],
-              :rrdata  => linearray[4]
+              :rrdata  => maybe_unquote(linearray[3], linearray[4])
             }
           end.select do |record|
             record[:name] == "#{name}."