--- a/config/mh-cygwin64	2018-01-12 11:14:38.088270200 +0100
+++ b/config/mh-cygwin64	2018-01-12 12:46:40.201493100 +0100
@@ -16,6 +16,8 @@
 else
 ## Make sure that the static libraries can be built
 STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
+## Do not forget to link in uconvmsg_dat
+CPPFLAGS += -DUCONVMSG_LINK
 endif
 
 ## Flags for position independent code
@@ -115,10 +117,10 @@
 BIR_DEPS=
 
 # Environment variable to set a runtime search path
-LDLIBRARYPATH_ENVVAR = PATH
+#LDLIBRARYPATH_ENVVAR = PATH
 
 # The type of assembly to write for generating an object file
-GENCCODE_ASSEMBLY=-a gcc-mingw64
+GENCCODE_ASSEMBLY=-a gcc-cygwin
 
 # put this here again so it gets cyguc...