diff --git a/dictsource/ms_list b/dictsource/ms_list
old mode 100755
new mode 100644
diff --git a/dictsource/ms_rules b/dictsource/ms_rules
old mode 100755
new mode 100644
diff --git a/dictsource/pa_list b/dictsource/pa_list
index b157c47d..538d31b4 100644
--- a/dictsource/pa_list
+++ b/dictsource/pa_list
@@ -1,246 +1,246 @@
-// This file is UTF8 encoded 		
-// Punjabi/Gurmukhi
-
-// Numbers
-_0	z'iRo
-_1	'Ik:
-_2	d'o
-_3	t'I~n
-_4	c'aR
-_5	p'VnJ
-_6	c#'e
-_7	s'Vt:
-_8	'Vt.#:
-_9	n'O~
-_10	d'Vs
-_11	gI'aRa~
-_12	b'aRa~
-_13	t'eRa~
-_14	c'Oda~
-_15	p'Vnd@Ra~
-_16	s'ol.a~
-_17	s@t'aRa~
-_18	Vt.#'aRa~
-_19	'Unni
-_20	v'iH
-_21	Ik:i
-_22	b'ai
-_23	t'ei
-_24	c'Ovi
-_25	p'Vc:i
-_26	c#'Vb:i
-_27	s@t'ai
-_28	Vt.#'ai
-_29	Un'Vt:i
-_30	t'iH
-_31	Ik'Vt:i
-_32	b'Vt:i
-_33	t'et:i
-_34	c'ONti
-_35	p'ENti
-_36	c#'Vt:i
-_37	s'ENti
-_38	Vt.#'Vt:i
-_39	U~Nt'ali
-_40	c'ali
-_41	Ik@t'ali
-_42	be'ali
-_43	t@R@t'ali
-_44	cUt'ali
-_45	p@nt'ali
-_46	c#I'ali
-_47	s@nt'ali
-_48	,@R2@t'ali
-_49	Un'VnJa
-_50	p@nJ'aH
-_51	,@k@v'VnJa
-_52	b@v'VnJa
-_53	t,@R@v'VnJa
-_54	cUR'VnJa
-_55	p,@c@v'VnJa
-_56	c#@p'VnJa
-_57	s,@t@v'VnJa
-_58	,@t.#@v'VnJa
-_59	Un.'at.#
-_60	s'Vt.#:
-_61	Ik'aH@t.
-_62	b'aH@t.
-_63	t@R'e~H@t.
-_64	c'O~H@t.
-_65	p'E~H@t.
-_66	c#e'aH@t.
-_67	s@t'aH@t.
-_68	,@t.#'aH@t.
-_69	Un.'Vt:@R
-_70	s'Vt:@R
-_71	Ik'Vt:@R
-_72	b@H'Vt:@R
-_73	t@H'et:@R
-_74	cOH'Vt:@R
-_75	p@J'Vt:@R
-_76	c#IH'Vt:@R
-_77	s@t'Vt:@R
-_78	Vt.#'Vt:@R
-_79	Un.'asi
-_80	'Vssi
-_81	,IkI;'asi
-_82	bI;'asi
-_83	t,@RI;'asi
-_84	cUR'asi
-_85	p@c'asi
-_86	c#I;'asi
-_87	s@t'asi
-_88	Vt.#'asi
-_89	Un'an@v,e~
-_90	n'Vb:e
-_91	Ik'an@v,e~
-_92	b'an@v,e~
-_93	t@R'a~n@v,e~
-_94	cUR'an@v,e~
-_95	p@c'an@v,e~
-_96	c#I'an@ve~
-_97	s@t'an@ve~
-_98	Vt.#'an@ve~
-_99	n@R2'I~n@v,e~
-
-_0C	s'O
-_0M1	H@J'aR
-_0M2	l'Vk#:	// 100,000
-_0M3	k'VRoR	// 10,000,000
-_0M4	'VR@b	// 1,000,000,000
-_0M5	k#'VR@b	// 100,000,000,000
-
-_dpt	_d@s@ml'o:
-
-
-// character names
-ਂ	bInd'i
-ੰ	tIpp'i
-ੱ	VddVk
-ਃ	visaRg
-੍	hVlVnt
-
-ਅ	'ERV
-ੲ	'IRI
-ੳ	'URV
-_ਆ	'ERV||kVnn'a
-_ਇ	'IRI||sIh'aRi
-_ਈ	'IRI||bIh'aRi
-_ਉ	'URV||'OnkaR
-_ਊ	'URV||dUl'EnkaR
-_ਏ	'IRI||l'avam
-_ਐ	'ERV||dUl'avam
-_ਓ	'URV||hoR'a
-_ਔ	'ERV||kVnOR'a
-
-ਾ	kVnn'a
-ਿ	sIh'aRi
-ੀ	bIh'aRi
-ੁ	OnkaR
-ੂ	dUl'EnkaR
-ੇ	l'ava~
-ੈ	d@l'ava~
-ੋ	hoR'a
-ੌ	kVn'ORa
-
-
-// Punctuation
-_??	'Vk#:@R
-।	d.'Vnd.i
-+	J'Vuma
-=	b@R'ab@R
-%	pR'VtIS@t
-*	t'aRa
-
-
-// Pronouns
-// ਪੁਰਖਵਾਚੀ ਪੜਨਾਂਵ
-ਮੈਂ 	$u	// main: I
-ਮੈਨੂੰ 	$u
-ਮੇਰਾ 	$u
-ਮੇਰੀ 	$u
-ਮੇਰੇ 	$u
-
-ਅਸੀਂ 	$u	// we
-ਸਾਨੂੰ 	$u
-ਸਾਡਾ 	$u
-ਸਾਡੀ 	$u
-ਸਾਡੇ 	$u
-
-
-ਆਪ 	$u	// you(formal)
-ਆਪਨੂੰ 	$u
-ਆਪਦਾ 	$u
-ਆਪਦੀ 	$u
-ਆਪਦੇ 	$u
-
-ਤੂੰ 	$u	// you (informal)
-ਤੂਸੀਂ 	$u	// you(formal)
-ਤੁਹਾਨੂੰ 	$u
-ਤੁਹਾਡਾ 	$u
-ਤੁਹਾਡੀ 	$u
-ਤੁਹਾਡੇ 	$u
-
-ਤੂੰ 	$u	// you (informal)
-ਤੈਨੂੰ 	$u
-ਤੇਰਾ 	$u
-
-ਇਹ	$u	// he/she/it
-ਇਸਤੋਂ 	$u
-ਇਸਦਾ 	$u
-
-ਇਹ 	$u	// they
-ਇਨ੍ਹਾਂਨੂੰ 	$u
-ਇਨ੍ਹਾਂਦਾ 	$u
-
-ਉਹ	$u	// he/she/it
-ਉਸਤੋਂ 	$u
-ਉਸਦਾ 	$u
-ਉਸਦੀ 	$u
-ਉਸਦੇ 	$u
-
-ਉਹ	$u	// they
-ਉਨ੍ਹਾਂਨੂੰ	$u	// unhannu: them 
-ਉਨ੍ਹਾਂਦਾ	$u
-ਉਨ੍ਹਾਂਦੀ	$u
-ਉਨ੍ਹਾਂਦੇ	$u
-
-
-
-// Prepositions/Postpositions
-ਦਾ	$u	// dā:  of, possessive particle
-ਦੀ	$u	// dī
-ਦੇ	$u	// de
-
-ਨੂੰ 	$u	// nu: to
-ਤੱਕ 	$u	// tak: until, for(time)
-ਬਿਨਾ	$u $pause	// without (preposition)
-ਵਿਚ 	$u	// in
-ਵਿੱਚ 	$u	// in
-ਤੋਂ 	$u	// ton: from, with, by
-
-
-
-// Verbs
-ਹਾਂ 	$u	// to be
-ਹੋ 	$u
-ਹੈ 	$u
-ਹੈਂ 	$u
-ਹਨ 	$u
-
-ਸੀ 	$u	// si: past aux
-ਸਨ 	$u	// san: past aux
-
-ਰਹਾ 	$u	// rahā: continuous
-ਰਹੇ 	$u	// rahe
-ਰਹੀ 	$u	// rahī
-
-
-
-$textmode
-ਸੋਫਟਵਿਅਰ  software
-ਈਮੇਲ   email
-ਕੀਬੋਰਡ  keyboard
-ਬੋਰਡ    board
-$phonememode
-
+// This file is UTF8 encoded 		
+// Punjabi/Gurmukhi
+
+// Numbers
+_0	z'iRo
+_1	'Ik:
+_2	d'o
+_3	t'I~n
+_4	c'aR
+_5	p'VnJ
+_6	c#'e
+_7	s'Vt:
+_8	'Vt.#:
+_9	n'O~
+_10	d'Vs
+_11	gI'aRa~
+_12	b'aRa~
+_13	t'eRa~
+_14	c'Oda~
+_15	p'Vnd@Ra~
+_16	s'ol.a~
+_17	s@t'aRa~
+_18	Vt.#'aRa~
+_19	'Unni
+_20	v'iH
+_21	Ik:i
+_22	b'ai
+_23	t'ei
+_24	c'Ovi
+_25	p'Vc:i
+_26	c#'Vb:i
+_27	s@t'ai
+_28	Vt.#'ai
+_29	Un'Vt:i
+_30	t'iH
+_31	Ik'Vt:i
+_32	b'Vt:i
+_33	t'et:i
+_34	c'ONti
+_35	p'ENti
+_36	c#'Vt:i
+_37	s'ENti
+_38	Vt.#'Vt:i
+_39	U~Nt'ali
+_40	c'ali
+_41	Ik@t'ali
+_42	be'ali
+_43	t@R@t'ali
+_44	cUt'ali
+_45	p@nt'ali
+_46	c#I'ali
+_47	s@nt'ali
+_48	,@R2@t'ali
+_49	Un'VnJa
+_50	p@nJ'aH
+_51	,@k@v'VnJa
+_52	b@v'VnJa
+_53	t,@R@v'VnJa
+_54	cUR'VnJa
+_55	p,@c@v'VnJa
+_56	c#@p'VnJa
+_57	s,@t@v'VnJa
+_58	,@t.#@v'VnJa
+_59	Un.'at.#
+_60	s'Vt.#:
+_61	Ik'aH@t.
+_62	b'aH@t.
+_63	t@R'e~H@t.
+_64	c'O~H@t.
+_65	p'E~H@t.
+_66	c#e'aH@t.
+_67	s@t'aH@t.
+_68	,@t.#'aH@t.
+_69	Un.'Vt:@R
+_70	s'Vt:@R
+_71	Ik'Vt:@R
+_72	b@H'Vt:@R
+_73	t@H'et:@R
+_74	cOH'Vt:@R
+_75	p@J'Vt:@R
+_76	c#IH'Vt:@R
+_77	s@t'Vt:@R
+_78	Vt.#'Vt:@R
+_79	Un.'asi
+_80	'Vssi
+_81	,IkI;'asi
+_82	bI;'asi
+_83	t,@RI;'asi
+_84	cUR'asi
+_85	p@c'asi
+_86	c#I;'asi
+_87	s@t'asi
+_88	Vt.#'asi
+_89	Un'an@v,e~
+_90	n'Vb:e
+_91	Ik'an@v,e~
+_92	b'an@v,e~
+_93	t@R'a~n@v,e~
+_94	cUR'an@v,e~
+_95	p@c'an@v,e~
+_96	c#I'an@ve~
+_97	s@t'an@ve~
+_98	Vt.#'an@ve~
+_99	n@R2'I~n@v,e~
+
+_0C	s'O
+_0M1	H@J'aR
+_0M2	l'Vk#:	// 100,000
+_0M3	k'VRoR	// 10,000,000
+_0M4	'VR@b	// 1,000,000,000
+_0M5	k#'VR@b	// 100,000,000,000
+
+_dpt	_d@s@ml'o:
+
+
+// character names
+ਂ	bInd'i
+ੰ	tIpp'i
+ੱ	VddVk
+ਃ	visaRg
+੍	hVlVnt
+
+ਅ	'ERV
+ੲ	'IRI
+ੳ	'URV
+_ਆ	'ERV||kVnn'a
+_ਇ	'IRI||sIh'aRi
+_ਈ	'IRI||bIh'aRi
+_ਉ	'URV||'OnkaR
+_ਊ	'URV||dUl'EnkaR
+_ਏ	'IRI||l'avam
+_ਐ	'ERV||dUl'avam
+_ਓ	'URV||hoR'a
+_ਔ	'ERV||kVnOR'a
+
+ਾ	kVnn'a
+ਿ	sIh'aRi
+ੀ	bIh'aRi
+ੁ	OnkaR
+ੂ	dUl'EnkaR
+ੇ	l'ava~
+ੈ	d@l'ava~
+ੋ	hoR'a
+ੌ	kVn'ORa
+
+
+// Punctuation
+_??	'Vk#:@R
+।	d.'Vnd.i
++	J'Vuma
+=	b@R'ab@R
+%	pR'VtIS@t
+*	t'aRa
+
+
+// Pronouns
+// ਪੁਰਖਵਾਚੀ ਪੜਨਾਂਵ
+ਮੈਂ 	$u	// main: I
+ਮੈਨੂੰ 	$u
+ਮੇਰਾ 	$u
+ਮੇਰੀ 	$u
+ਮੇਰੇ 	$u
+
+ਅਸੀਂ 	$u	// we
+ਸਾਨੂੰ 	$u
+ਸਾਡਾ 	$u
+ਸਾਡੀ 	$u
+ਸਾਡੇ 	$u
+
+
+ਆਪ 	$u	// you(formal)
+ਆਪਨੂੰ 	$u
+ਆਪਦਾ 	$u
+ਆਪਦੀ 	$u
+ਆਪਦੇ 	$u
+
+ਤੂੰ 	$u	// you (informal)
+ਤੂਸੀਂ 	$u	// you(formal)
+ਤੁਹਾਨੂੰ 	$u
+ਤੁਹਾਡਾ 	$u
+ਤੁਹਾਡੀ 	$u
+ਤੁਹਾਡੇ 	$u
+
+ਤੂੰ 	$u	// you (informal)
+ਤੈਨੂੰ 	$u
+ਤੇਰਾ 	$u
+
+ਇਹ	$u	// he/she/it
+ਇਸਤੋਂ 	$u
+ਇਸਦਾ 	$u
+
+ਇਹ 	$u	// they
+ਇਨ੍ਹਾਂਨੂੰ 	$u
+ਇਨ੍ਹਾਂਦਾ 	$u
+
+ਉਹ	$u	// he/she/it
+ਉਸਤੋਂ 	$u
+ਉਸਦਾ 	$u
+ਉਸਦੀ 	$u
+ਉਸਦੇ 	$u
+
+ਉਹ	$u	// they
+ਉਨ੍ਹਾਂਨੂੰ	$u	// unhannu: them 
+ਉਨ੍ਹਾਂਦਾ	$u
+ਉਨ੍ਹਾਂਦੀ	$u
+ਉਨ੍ਹਾਂਦੇ	$u
+
+
+
+// Prepositions/Postpositions
+ਦਾ	$u	// dā:  of, possessive particle
+ਦੀ	$u	// dī
+ਦੇ	$u	// de
+
+ਨੂੰ 	$u	// nu: to
+ਤੱਕ 	$u	// tak: until, for(time)
+ਬਿਨਾ	$u $pause	// without (preposition)
+ਵਿਚ 	$u	// in
+ਵਿੱਚ 	$u	// in
+ਤੋਂ 	$u	// ton: from, with, by
+
+
+
+// Verbs
+ਹਾਂ 	$u	// to be
+ਹੋ 	$u
+ਹੈ 	$u
+ਹੈਂ 	$u
+ਹਨ 	$u
+
+ਸੀ 	$u	// si: past aux
+ਸਨ 	$u	// san: past aux
+
+ਰਹਾ 	$u	// rahā: continuous
+ਰਹੇ 	$u	// rahe
+ਰਹੀ 	$u	// rahī
+
+
+
+$textmode
+ਸੋਫਟਵਿਅਰ  software
+ਈਮੇਲ   email
+ਕੀਬੋਰਡ  keyboard
+ਬੋਰਡ    board
+$phonememode
+
diff --git a/dictsource/si_list b/dictsource/si_list
index 146a69a1..84d602a6 100644
--- a/dictsource/si_list
+++ b/dictsource/si_list
@@ -105,34 +105,34 @@ _dpt	d'aS@m#@
 // Consonants
 
 ක	k@
-ඛ	kh@
+ඛ	k#@
 ග	g@
-ඝ	gh@
+ඝ	g#@
 ඞ	N@
 ඟ	N#g@
 ච	tS@
-ඡ	tSh@
+ඡ	tS#@
 ජ	dZ@
-ඣ	dZh@
+ඣ	dZ#@
 ඤ	n^@
 ඥ	gn@
 ඦ	n^#dZ@
 ට	t.@
-ඨ	t.h@
+ඨ	t.#@
 ඩ	d.@
-ඪ	d.h@
+ඪ	d.#@
 ණ	n.@
 ඬ	n.#d.@
 ත	t@
-ථ	th@
+ථ	t#@
 ද	d@
-ධ	dh@
+ධ	d#@
 න	n@
 ඳ	n#d@
 ප	p@
-ඵ	ph@
+ඵ	p#@
 බ	b@
-භ	bh@
+භ	b#@
 ම	m@
 ඹ	m#b@
 ය	j@
@@ -153,7 +153,7 @@ _,	k'oma:v@
 ?	pr'a:Sna:rt,@j@ 
 !	v'iSm#@j,a:rt@j@
 _“	'udrut,@pa:t.,@a:r,@mb@j@
-_”	 'udhrut,@pa:t.h,@@w,@s.a:n,@j@
+_”	 'ud#rut,@pa:t.#,@@w,@s.a:n,@j@
 _:	t'itkom,a:v@
 _;	d'etit@
 $	do:l.ar		$max3
diff --git a/dictsource/si_rules b/dictsource/si_rules
index a27479fe..80f44fb3 100644
--- a/dictsource/si_rules
+++ b/dictsource/si_rules
@@ -19,16 +19,16 @@
 	 ක (B	k
 
 .group ඛ
-	ඛ	kha
-	ඛ (B	kh
+	ඛ	k#a
+	ඛ (B	k#
 
 .group ග
 	ග	ga
 	ග (B	g
 
 .group ඝ
-	ඝ	gha
-	ඝ (B	gh
+	ඝ	g#a
+	ඝ (B	g#
 
 .group ඞ
 	ඞ	Na
@@ -71,8 +71,8 @@
 	ට (B	t.
 
 .group ඨ
-	ඨ	t.ha
-	ඨ (B	t.h
+	ඨ	t.#a
+	ඨ (B	t.#
 
 .group ඩ
         ඩ          d.a
@@ -95,16 +95,16 @@
 	ත (B	t
 
 .group ථ
-	ථ	tha
-	ථ (B	th
+	ථ	t#a
+	ථ (B	t#
 
 .group ද
 	ද	da
 	ද (B	d
 
 .group ධ
-	ධ	dha
-	ධ (B	dh
+	ධ	d#a
+	ධ (B	d#
 
 .group න
 	න	na
@@ -119,16 +119,16 @@
 	ප (B	p
 
 .group ඵ
-	ඵ	pha
-	ඵ (B	ph
+	ඵ	p#a
+	ඵ (B	p#
 
 .group බ
 	බ	ba
 	බ (B	b
 
 .group භ
-	භ	bha
-	භ (B	bh
+	භ	b#a
+	භ (B	b#
 
 .group ම
 	ම	ma
diff --git a/espeak-data/voices/asia/ms b/espeak-data/voices/asia/ms
new file mode 100644
index 00000000..90a38a37
--- /dev/null
+++ b/espeak-data/voices/asia/ms
@@ -0,0 +1,17 @@
+// Last updated: 14 October 2010, Jason Ong (jason@portalgroove.com)
+name malay
+language ms
+gender male
+phonemes id
+
+translator id
+
+stressLength 160 200  180 180  0 0  220 240
+stressAmp    16  18   18  18   0 0  22  21
+intonation	3	// Less intonation, and comma does not raise the pitch.
+
+// Nuance - Peninsula Malaysia
+// replace	3 a	@	// change 'saya' to 'saye'
+				// (only the last phoneme of a word, only in unstressed syllables)
+				
+consonants 80 80
diff --git a/espeak-data/voices/test/bn b/espeak-data/voices/test/bn
new file mode 100644
index 00000000..1e99fa8c
--- /dev/null
+++ b/espeak-data/voices/test/bn
@@ -0,0 +1,3 @@
+name bengali
+language bn
+gender male
diff --git a/phsource/ph_portugal b/phsource/ph_portugal
index df714512..37f51ed7 100644
--- a/phsource/ph_portugal
+++ b/phsource/ph_portugal
@@ -133,6 +133,23 @@ phoneme w
 endphoneme
 
 
+phoneme x      // [r] for Portugal
+  liquid
+  trill
+  ipa ʁ
+  lengthmod 7
+  Vowelin f1=0  f2=1500 -400 400  f3=-400 80
+  IF nextPh(isNotVowel) THEN
+    ChangePhoneme(r/)
+  ENDIF
+  FMT(vwl_fr/@R) addWav(r3/rx, 120)
+endphoneme
+
+
+phoneme R    // for Portugal this is same the as [r]
+  import_phoneme pt/r
+endphoneme
+
 
 phoneme s#     // This is [s] for Brazil, [S] for Portugal
   CALL base/S
diff --git a/phsource/ph_sinhala b/phsource/ph_sinhala
index d606b32e..cee7ba6f 100644
--- a/phsource/ph_sinhala
+++ b/phsource/ph_sinhala
@@ -6,7 +6,7 @@
 
 phoneme @
   vowel  starttype #a  endtype #a
-  length 130
+  length 150
   FMT(vowel/@_low)
 endphoneme
 
@@ -14,7 +14,7 @@ endphoneme
 phoneme a
   vowel long starttype #a endtype #a
   ipa ɐ
-  length 130
+  length 150
   ChangeIfNotStressed(@)
   FMT(vowel/a#_2)
 endphoneme
@@ -29,42 +29,42 @@ endphoneme
 
 phoneme &
   vowel  starttype #e  endtype #e
-  length 130
+  length 150
   FMT(vowel/ee_6)
 endphoneme
 
 
 phoneme &:
   vowel  starttype #e  endtype #e
-  length 270
+  length 300
   FMT(vowel/ee_6)
 endphoneme
 
 
 phoneme e
   vowel  starttype #e  endtype #e
-  length 130
+  length 150
   FMT(vowel/e_mid)
 endphoneme
 
 
 phoneme e:
   vowel  starttype #e  endtype #e
-  length 270
+  length 300
   FMT(vowel/e_mid2)
 endphoneme
 
 
 phoneme i
   vowel  starttype #i  endtype #i
-  length 130
+  length 150
   FMT(vowel/i_6)
 endphoneme
 
 
 phoneme i:
   vowel  starttype #i  endtype #i
-  length 270
+  length 300
   FMT(vowel/i)
 endphoneme
 
@@ -72,7 +72,7 @@ endphoneme
 
 phoneme o
   vowel  starttype #o  endtype #o
-  length 130
+  length 150
   FMT(vowel/oo_1)
 endphoneme
 
@@ -86,13 +86,13 @@ endphoneme
 
 phoneme u
   vowel  starttype #u  endtype #u
-  length 110
+  length 130
   FMT(vowel/u_6)
 endphoneme
 
 phoneme u:
   vowel  starttype #u  endtype #u
-  length 280
+  length 300
   FMT(vowel/u_6)
 endphoneme
 
@@ -100,13 +100,13 @@ endphoneme
 
 phoneme aI
   vowel long starttype #a endtype #i
-  length 280
+  length 300
   FMT(vdiph/ai_8)
 endphoneme
 
 phoneme aU
   vowel long starttype #a endtype #u
-  length 270
+  length 300
   FMT(vdiph/au)
 endphoneme
 
@@ -130,21 +130,26 @@ endphoneme
 // temporary, map [n#] etc. to [n] etc.
 
 phoneme m#
-  import_phoneme base/m
+  ipa U+1D50
+  CALL base/m
 endphoneme
 
 phoneme n#
-  import_phoneme base/n
+  ipa U+207F
+  CALL base/n
 endphoneme
 
 phoneme n.#
-  import_phoneme base/n.
+  ipa U+1DAF
+  CALL base/n.
 endphoneme
 
 phoneme n^#
-  import_phoneme base/n^
+  ipa U+1DAE
+  CALL base/n^
 endphoneme
 
 phoneme N#
-  import_phoneme base/N
+  ipa U+1D51
+  CALL base/N
 endphoneme
diff --git a/platforms/windows/make_espeak.iss b/platforms/windows/make_espeak.iss
index 2a83b5fa..439e913b 100644
--- a/platforms/windows/make_espeak.iss
+++ b/platforms/windows/make_espeak.iss
@@ -2,7 +2,7 @@
 
 [Setup]
 AppName=eSpeak
-AppVerName=eSpeak version 1.47.03
+AppVerName=eSpeak version 1.47.01
 AppCopyright=Licensed under GNU General Public License version 3.   (See file License.txt for details).
 WindowVisible=yes
 
diff --git a/platforms/windows/make_espeakedit.iss b/platforms/windows/make_espeakedit.iss
index bafbdf3e..ffbebf1c 100644
--- a/platforms/windows/make_espeakedit.iss
+++ b/platforms/windows/make_espeakedit.iss
@@ -1,7 +1,7 @@
 
 [Setup]
 AppName=eSpeakEdit
-AppVerName=eSpeakEdit version 1.47.03
+AppVerName=eSpeakEdit version 1.47.01
 DefaultDirName={pf}\eSpeak
 DefaultGroupName=eSpeak
 OutputBaseFilename=setup_espeakedit
@@ -32,24 +32,18 @@ Source: "License.txt"; DestDir: "{app}";
 [Languages]
 Name: "en"; MessagesFile: "compiler:Default.isl"
 Name: "af"; MessagesFile: "compiler:Languages\Afrikaans.isl"
-Name: "bg"; MessagesFile: "compiler:Languages\Bulgarian.isl"
 Name: "bs"; MessagesFile: "compiler:Languages\Bosnian.isl"
 Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl"
-Name: "da"; MessagesFile: "compiler:Languages\Danish.isl"
 Name: "de"; MessagesFile: "compiler:Languages\German.isl"
 Name: "el"; MessagesFile: "compiler:Languages\Greek.isl"
 Name: "es"; MessagesFile: "compiler:Languages\Spanish.isl"
-Name: "fa"; MessagesFile: "compiler:Languages\Farsi.isl"
 Name: "fi"; MessagesFile: "compiler:Languages\Finnish.isl"
 Name: "fr"; MessagesFile: "compiler:Languages\French.isl"
-Name: "hi"; MessagesFile: "compiler:Languages\Hindi.islu"
 Name: "hr"; MessagesFile: "compiler:Languages\Croatian.isl"
 Name: "hu"; MessagesFile: "compiler:Languages\Hungarian.isl"
 Name: "id"; MessagesFile: "compiler:Languages\Indonesian-5.1.11.isl"
 Name: "it"; MessagesFile: "compiler:Languages\Italian.isl"
-Name: "ka"; MessagesFile: "compiler:Languages\Georgian.islu"
-Name: "lv"; MessagesFile: "compiler:Languages\Latvian.isl"
-Name: "ne"; MessagesFile: "compiler:Languages\Nepali.islu"
+Name: "lv"; MessagesFile: "compiler:Languages\Latvian-1-5.1.11.isl"
 Name: "nl"; MessagesFile: "compiler:Languages\Dutch.isl"
 Name: "no"; MessagesFile: "compiler:Languages\Norwegian.isl"
 Name: "pl"; MessagesFile: "compiler:Languages\Polish.isl"
@@ -57,8 +51,8 @@ Name: "pt"; MessagesFile: "compiler:Languages\Portuguese.isl"
 Name: "ro"; MessagesFile: "compiler:Languages\Romanian.isl"
 Name: "ru"; MessagesFile: "compiler:Languages\Russian.isl"
 Name: "sk"; MessagesFile: "compiler:Languages\Slovak.isl"
+;Name: "sq"; MessagesFile: "compiler:Languages\Albanian-2-5.1.11.isl"
 Name: "sr"; MessagesFile: "compiler:Languages\Serbian.isl"
 Name: "tr"; MessagesFile: "compiler:Languages\Turkish.isl"
-Name: "vi"; MessagesFile: "compiler:Languages\Vietnamese.isl"
 Name: "zh"; MessagesFile: "compiler:Languages\ChineseSimp-12-5.1.11.isl"