Index: src_plugins/export_openems/export_openems.c
===================================================================
--- src_plugins/export_openems/export_openems.c	(revision 32008)
+++ src_plugins/export_openems/export_openems.c	(revision 32009)
@@ -369,6 +369,15 @@
 	fprintf(ctx->f, "\n");
 }
 
+static void openems_wr_m_vport(wctx_t *ctx, pcb_any_obj_t *o, rnd_coord_t x, rnd_coord_t y, rnd_layergrp_id_t gid1, rnd_layergrp_id_t gid2, const char *safe_name, double resistance, int act)
+{
+	ctx->port_id++;
+
+	rnd_fprintf(ctx->f, "\npoint%s(1, 1) = %mm; point%s(2, 1) = %mm;\n", safe_name, x, safe_name, -y);
+	fprintf(ctx->f, "[start%s, stop%s] = CalcPcbrnd2PortV(PCBRND, point%s, %d, %d);\n", safe_name, safe_name, safe_name, ctx->lg_pcb2ems[gid1], ctx->lg_pcb2ems[gid2]);
+	fprintf(ctx->f, "[CSX, port{%ld}] = AddLumpedPort(CSX, 999, %ld, %f, start%s, stop%s, [0 0 -1]%s);\n", ctx->port_id, ctx->port_id, resistance, safe_name, safe_name, act ? ", true" : "");
+}
+
 static void openems_vport_write(wctx_t *ctx, pcb_any_obj_t *o, rnd_coord_t x, rnd_coord_t y, rnd_layergrp_id_t gid1, rnd_layergrp_id_t gid2, const char *port_name)
 {
 	char *end, *s, *safe_name = rnd_strdup(port_name);
@@ -376,8 +385,6 @@
 	double resistance = ctx->options[HA_def_port_res].dbl;
 	int act = 1;
 
-	ctx->port_id++;
-
 	att = rnd_attribute_get(&o->Attributes, "openems::resistance");
 	if (att != NULL) {
 		double tmp = strtod(att, &end);
@@ -401,9 +408,10 @@
 		if (!isalnum(*s))
 			*s = '_';
 
-	rnd_fprintf(ctx->f, "\npoint%s(1, 1) = %mm; point%s(2, 1) = %mm;\n", safe_name, x, safe_name, -y);
-	fprintf(ctx->f, "[start%s, stop%s] = CalcPcbrnd2PortV(PCBRND, point%s, %d, %d);\n", safe_name, safe_name, safe_name, ctx->lg_pcb2ems[gid1], ctx->lg_pcb2ems[gid2]);
-	fprintf(ctx->f, "[CSX, port{%ld}] = AddLumpedPort(CSX, 999, %ld, %f, start%s, stop%s, [0 0 -1]%s);\n", ctx->port_id, ctx->port_id, resistance, safe_name, safe_name, act ? ", true" : "");
+	if (ctx->fmt_matlab)
+		openems_wr_m_vport(ctx, o, x, y, gid1, gid2, safe_name, resistance, act);
+/*	else
+		openems_wr_xml_vport(ctx, o, x, y, gid1, gid2, safe_name, resistance, act);*/
 
 	free(safe_name);
 }
@@ -460,7 +468,7 @@
 
 
 #define TPMASK (PCB_OBJ_LINE | PCB_OBJ_PSTK | PCB_OBJ_SUBC)
-static void openems_wr_m_testpoints(wctx_t *ctx, pcb_data_t *data)
+static void openems_wr_testpoints(wctx_t *ctx, pcb_data_t *data)
 {
 	pcb_any_obj_t *o;
 	pcb_data_it_t it;
@@ -468,7 +476,7 @@
 	for(o = pcb_data_first(&it, data, TPMASK); o != NULL; o = pcb_data_next(&it)) {
 		const char *port_name;
 		if (o->type == PCB_OBJ_SUBC)
-			openems_wr_m_testpoints(ctx, ((pcb_subc_t *)o)->data);
+			openems_wr_testpoints(ctx, ((pcb_subc_t *)o)->data);
 
 		port_name = rnd_attribute_get(&o->Attributes, "openems::vport");
 		if (port_name == NULL)
@@ -636,7 +644,7 @@
 		rnd_expose_main(&openems_hid, &ctx, NULL);
 
 		fprintf(wctx.f, "%%%%%% Port(s) on terminals\n");
-		openems_wr_m_testpoints(&wctx, wctx.pcb->Data);
+		openems_wr_testpoints(&wctx, wctx.pcb->Data);
 	}
 	else { /* xml */
 		if (openems_wr_xml(&wctx) != 0)
Index: src_plugins/export_openems/openems_xml.c
===================================================================
--- src_plugins/export_openems/openems_xml.c	(revision 32008)
+++ src_plugins/export_openems/openems_xml.c	(revision 32009)
@@ -249,6 +249,9 @@
 	fprintf(ctx->f, "    <BackgroundMaterial Epsilon='%f' Mue='%f' Kappa='0' Sigma='0'/>\n", ctx->options[HA_void_epsilon].dbl, ctx->options[HA_void_mue].dbl);
 
 	err |= openems_wr_xml_layers(ctx);
+
+	openems_wr_testpoints(ctx, ctx->pcb->Data);
+
 	openems_wr_xml_grid(ctx, mesh);
 	fprintf(ctx->f, "  </ContinuousStructure>\n");