diff --git a/dosutils b/dosutils
index 5e75a9e..ad2bc6b 160000
--- a/dosutils
+++ b/dosutils
@@ -1 +1 @@
-Subproject commit 5e75a9e8a706830341caf6d2f0516cc945dbf25a
+Subproject commit ad2bc6b02e74bda53cd5281125f116dc0a51177a
diff --git a/mail b/mail
index e49fb58..76d2980 160000
--- a/mail
+++ b/mail
@@ -1 +1 @@
-Subproject commit e49fb581e465467d3e66fa9d6e87767e5f9ac009
+Subproject commit 76d298045b6f6295ef2486bd1adb0ba84122e3f0
diff --git a/opt/CMakeLists.txt b/opt/CMakeLists.txt
index c6f7b98..1095803 100644
--- a/opt/CMakeLists.txt
+++ b/opt/CMakeLists.txt
@@ -51,13 +51,13 @@ add_executable( unxsendm unxsendm.c )
 # Install Files
 ##############
 
-install(FILES nwserv.conf DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nwserv.conf DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR})
 install(FILES nwserv.stations DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR})
-install(FILES nw.ini.cnv.437 DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR}/nwserv.cnv.437)
-install(FILES nw.ini.cnv.cyr DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR}/nwserv.cnv.cyr)
-install(FILES nw.ini.cnv.min DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR}/nwserv.cnv.min)
-install(FILES nwopt DESTINATION ${MARS_NWE_INSTALL_FULL_FILEDIR}/SYS/.nwopt.vol)
-install(FILES nwopt DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/skel/.nwopt)
+install(FILES nw.ini.cnv.437 DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR} RENAME nwserv.cnv.437)
+install(FILES nw.ini.cnv.cyr DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR} RENAME nwserv.cnv.cyr)
+install(FILES nw.ini.cnv.min DESTINATION ${MARS_NWE_INSTALL_FULL_CONFDIR} RENAME nwserv.cnv.min)
+install(FILES nwopt DESTINATION ${MARS_NWE_INSTALL_FULL_FILEDIR}/SYS RENAME .nwopt.vol)
+install(FILES nwopt DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/skel RENAME .nwopt)
 
 install(TARGETS comm DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXECDIR})
 install(TARGETS sendm DESTINATION ${MARS_NWE_INSTALL_FULL_LIBEXECDIR})
diff --git a/sys/CMakeLists.txt b/sys/CMakeLists.txt
index a70aec5..6f357e8 100644
--- a/sys/CMakeLists.txt
+++ b/sys/CMakeLists.txt
@@ -47,5 +47,5 @@ add_definitions(
 # Install Files
 ##############
 
-install(FILES net$log.dat comm.exe comm32.exe DESTINATION ${MARS_NWE_INSTALL_FULL_FILEDIR}/SYS/)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/net$log.dat comm.exe comm32.exe DESTINATION ${MARS_NWE_INSTALL_FULL_FILEDIR}/SYS/public)