diff --git a/CMakeLists.txt b/CMakeLists.txt
index c82afa900b..7aaf71d7c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,6 +243,11 @@ if (BUILD_ADSK_PLUGIN)
     install(FILES ${PROJECT_BINARY_DIR}/mayaUSD.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
 
+if (BUILD_HDMAYA)
+    configure_file("modules/mtoh.mod.template" ${PROJECT_BINARY_DIR}/mtoh.mod)
+    install(FILES ${PROJECT_BINARY_DIR}/mtoh.mod DESTINATION ${CMAKE_INSTALL_PREFIX})
+endif()
+
 if (BUILD_PXR_PLUGIN)
     if (IS_WINDOWS)
         configure_file("modules/pxrUSD_Win.mod.template" ${PROJECT_BINARY_DIR}/pxrUSD.mod)
diff --git a/lib/mayaUsd/ufe/UsdAttribute.cpp b/lib/mayaUsd/ufe/UsdAttribute.cpp
index 4c9375b523..238d83266d 100644
--- a/lib/mayaUsd/ufe/UsdAttribute.cpp
+++ b/lib/mayaUsd/ufe/UsdAttribute.cpp
@@ -263,7 +263,7 @@ class SetUndoableCommand : public MayaUsd::ufe::UsdUndoableCommand<Ufe::Undoable
         MayaUsd::ufe::InSetAttribute inSetAttr;
         MayaUsd::ufe::UsdUndoableCommand<Ufe::UndoableCommand>::undo();
     }
-    
+
     void redo() override
     {
         MayaUsd::ufe::InSetAttribute inSetAttr;
diff --git a/modules/mayaUSD.mod.template b/modules/mayaUSD.mod.template
index 961de8c5d8..69f3ca99c8 100644
--- a/modules/mayaUSD.mod.template
+++ b/modules/mayaUSD.mod.template
@@ -23,10 +23,3 @@ ${MAYAUSD_GTEST_PATH}
 
 + MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
 plug-ins: plugin
-
-+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
-icons: 
-plug-ins: maya
-presets: 
-scripts: 
-resources: 
diff --git a/modules/mayaUSD_Win.mod.template b/modules/mayaUSD_Win.mod.template
index b980283e91..ed12ee0171 100644
--- a/modules/mayaUSD_Win.mod.template
+++ b/modules/mayaUSD_Win.mod.template
@@ -31,10 +31,3 @@ ${MAYAUSD_GTEST_PATH}
 
 + MayaUSD ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/plugin/adsk
 plug-ins: plugin
-
-+ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
-icons: 
-plug-ins: maya
-presets: 
-scripts: 
-resources: 
diff --git a/modules/mtoh.mod.template b/modules/mtoh.mod.template
new file mode 100644
index 0000000000..c6ba32d916
--- /dev/null
+++ b/modules/mtoh.mod.template
@@ -0,0 +1,6 @@
++ MTOH ${MAYAUSD_VERSION} ${CMAKE_INSTALL_PREFIX}/lib
+icons: 
+plug-ins: maya
+presets: 
+scripts: 
+resources: