diff --git a/include/cantera/base/YamlWriter.h b/include/cantera/base/YamlWriter.h
index 0bb023b0ecb..c80b2604205 100644
--- a/include/cantera/base/YamlWriter.h
+++ b/include/cantera/base/YamlWriter.h
@@ -59,6 +59,12 @@ class YamlWriter
     //!     corresponding units supported by the UnitSystem class.
     void setUnits(const std::map<std::string, std::string>& units={});
 
+    //! Set the units to be used in the output file. Dimensions not specified
+    //! will use Cantera's defaults.
+    //! @param units  A UnitSystem object specifying dimensions (mass, length, time,
+    //!     quantity, pressure, energy, activation-energy).
+    void setUnits(const UnitSystem& units=UnitSystem());
+
 protected:
     std::vector<shared_ptr<Solution>> m_phases;
 
diff --git a/interfaces/cython/cantera/_cantera.pxd b/interfaces/cython/cantera/_cantera.pxd
index ce07625f061..c8a4f91c966 100644
--- a/interfaces/cython/cantera/_cantera.pxd
+++ b/interfaces/cython/cantera/_cantera.pxd
@@ -649,6 +649,7 @@ cdef extern from "cantera/base/YamlWriter.h" namespace "Cantera":
         void setPrecision(int)
         void skipUserDefined(cbool)
         void setUnits(stdmap[string, string]&) except +translate_exception
+        void setUnits(CxxUnitSystem) except +translate_exception
 
 cdef extern from "cantera/equil/MultiPhase.h" namespace "Cantera":
     cdef cppclass CxxMultiPhase "Cantera::MultiPhase":
@@ -1223,6 +1224,8 @@ cdef class DustyGasTransport(Transport):
 cdef class YamlWriter:
     cdef shared_ptr[CxxYamlWriter] _writer
     cdef CxxYamlWriter* writer
+    @staticmethod
+    cdef CxxUnitSystem _get_unitsystem(UnitSystem units)
 
 cdef class Mixture:
     cdef CxxMultiPhase* mix
diff --git a/interfaces/cython/cantera/yamlwriter.pyx b/interfaces/cython/cantera/yamlwriter.pyx
index 76af82536f7..eb0d828ba6b 100644
--- a/interfaces/cython/cantera/yamlwriter.pyx
+++ b/interfaces/cython/cantera/yamlwriter.pyx
@@ -55,14 +55,15 @@ cdef class YamlWriter:
             corresponding units such as kg, mm, s, kmol, Pa, cal, and eV.
         """
         def __set__(self, units):
-            if isinstance(units, UnitSystem):
-                defaults = UnitSystem().units
-                units = {k: v for k, v in units.units.items() if defaults[k] != v}
-            cdef stdmap[string, string] cxxunits
-            for dimension, unit in units.items():
-                cxxunits[stringify(dimension)] = stringify(unit)
+            if not isinstance(units, UnitSystem):
+                units = UnitSystem(units)
+            cdef CxxUnitSystem cxxunits = YamlWriter._get_unitsystem(units)
             self.writer.setUnits(cxxunits)
 
+    @staticmethod
+    cdef CxxUnitSystem _get_unitsystem(UnitSystem units):
+        return units.unitsystem
+
     def __reduce__(self):
         raise NotImplementedError('YamlWriter object is not picklable')
 
diff --git a/src/base/YamlWriter.cpp b/src/base/YamlWriter.cpp
index ad4ddf6ba65..ee5aa3f3347 100644
--- a/src/base/YamlWriter.cpp
+++ b/src/base/YamlWriter.cpp
@@ -160,4 +160,9 @@ void YamlWriter::setUnits(const std::map<std::string, std::string>& units)
     m_output_units.setDefaults(units);
 }
 
+void YamlWriter::setUnits(const UnitSystem& units)
+{
+    m_output_units = units;
+}
+
 }