diff --git a/transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformationHandler.java b/transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformationHandler.java
index d10ce0ad66a98cc3c094e6298e67a3455fc7ea22..4dfefe486fc34d54011ffc275226c72bdff73a19 100644
--- a/transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformationHandler.java
+++ b/transformations/org.universaal.tools.transformationcommand/src/org/universaal/tools/transformationcommand/handlers/TransformationHandler.java
@@ -239,6 +239,8 @@ public abstract class TransformationHandler extends AbstractHandler implements E
 
 
 		execMgr.setBlockCommentTag("//");
+		// Use UTF-8 as the encoding of the generated files
+		execMgr.setCharset("UTF-8");
 
 		// Adds an output listener for the transformation execution.
 		execMgr.getExecutionStack().addOutputMessageListener(this);   
diff --git a/transformations/org.universaal.tools.transformationcommand/transformations/ontUML2JavaV2.m2t b/transformations/org.universaal.tools.transformationcommand/transformations/ontUML2JavaV2.m2t
index c44804f2db0466e369aa063df13c5e13ecfbba51..082a05e86de1615d4ee4bdade17db798f18a9617 100644
--- a/transformations/org.universaal.tools.transformationcommand/transformations/ontUML2JavaV2.m2t
+++ b/transformations/org.universaal.tools.transformationcommand/transformations/ontUML2JavaV2.m2t
@@ -1041,7 +1041,7 @@ public class ' ontologyName 'Factory extends ResourceFactoryImpl {
  	}
  	'</description>
  	<properties>
- 	    <project.build.sourceEncoding>UTF-16</project.build.sourceEncoding>
+ 	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  	</properties>
   	<packaging>bundle</packaging>
     	<dependencies>'