diff --git a/dictsource/af_list b/dictsource/af_list
index e99844aa..e259bfc2 100755
--- a/dictsource/af_list
+++ b/dictsource/af_list
@@ -250,7 +250,6 @@ wallonië    val'o@ni@
 washington  _^_EN
 wellington  wEliNt@n
 wolseley    wulsli
-worcester   v'ust@r
 uganda      ug'anda
 zimbabwe    zI:mb'ab_wE
 zulu        zulu // Kwazulu-Natal
@@ -336,6 +335,7 @@ francina    $2
 francois    franSwa
 françois    frA~nsw'A:
 gabriël     x2A:bri@l
+gandhi      gandi
 george      _^_EN
 georgina    dZO:dZ'ina
 gerhard     x2&rart
@@ -915,7 +915,6 @@ petite        p@tit
 pinotage      pinut'A:Z
 pirouette     p@ru:'Et
 plasenta      plas'Enta
-primaat       $2
 primate       $2
 (pro forma) pro@||f'Orma
 
diff --git a/dictsource/af_rules b/dictsource/af_rules
index 45bc501a..acd4203f 100755
--- a/dictsource/af_rules
+++ b/dictsource/af_rules
@@ -56,6 +56,7 @@
              agtereen (volg %ax2t@r_%e@n // move default stress: agtereenvolgend/-e/-ens
              agter (oor   %ax2t@r_ // move default stress: agteroor/-buig/-druk/-val, etc.
           &) agtig        'ax2t@x2 // this string almost always carries stress on a
+             a (gurkie    %a // fix stress and a sound: agurkie/-s and compounds
          _C) ali (forni   %al@ // stress and vowel sounds: (C/K)alifornië/-niese
              ara (bi      %arA: // fix 1st a sound and stress: Arabië/Arabies/-e
              ara (bier    %ar%a // Stress and a sounds: Arabier/-e
@@ -69,6 +70,7 @@
              arm (last    %ar@-m // move default stress: armlastig/-e
          @C) as (_        as // shorten final a of words ending in -as: rigtingvas/jonkmanskas, etc.
           C) asie        'A:si
+       @@@@) asie         A:s%i
         oub) asie         A:si // restore default stress: oubasie/-s
       @form) asie         A:si // restore default stress to compounds ending in -formasie: graniet-/grond-/rotsformasie, etc.
          pl) asie         A:s%i // restore default stress: gemeenplasies/gemeenskapsplasies and similar
@@ -444,6 +446,7 @@
              baklei       b@kl'eI // baklei/er
           _) bak (o       bak_ // fix a sound and stress: bakoor/bakore
              balaklava    b%al%aklA:v%a // fix stress, a and v sounds: balaklava and compounds
+             balaklawa    b%al%aklA:v%a // fix stress and a sounds: balaklawa and compounds
              ba (lans     b%a // move default stress
              balan (seer  b%al%an // move stress to -eer
              ba (ldadig   b%a // move default stress: baldadig and derivatives
@@ -617,6 +620,7 @@
 .group c
              c            k
              c (c
+             calamari     k%al%amA:r%i // fix stress and a sounds: calamari and compounds
              cal (vA      k%al // move default stress: Calvinia/Calvyn/-se
              c (e         s
              c (i         s
@@ -728,6 +732,7 @@
              deur (winter d%y@r // move default stress: deurwinter/-de
              dia (C       d%i%a // diabeet/diafragma/diagnose/dialek/dialoog/diamant
              diaken       d%iA:k@n // diaken and compounds
+             diako (nie   d%i%ak%u // fix stress and o sound: diakonie/-ë
              diens (willi d%ins // move default stress: dienswillig/-e/-heid
              dieper (@    dip@r // fix e sound: diepere/dieperliggend/-e
              digi (ta     d%ix2%i // move default stress: digitaal/digitale
@@ -768,6 +773,7 @@
 
 //       &C) dele (_      de@l@ 
           _) dames        d'A:m@s // numerous compounds with dames
+      kandi) date (C      dA:t@ // fix e sound: kandidatelys/-te/-poel
              de (bA       d@      // debat/-te/debakel/waardebepaling
              deba (tteer  d@b%a // move default stress to end: debatteer
              debi (te     d%Eb%i // fix stress and e sound: debiteer/debiteur/debitering
@@ -783,7 +789,7 @@
              detail       d'i:teIl
              detai (lleer d%i:t%eI // fix stress: (ge)detailleer(d/-e)
              di (ssi      d@ // move default stress: dissipel/-s
-             dissi (pl    d@s@ // fix stress: dissipline/-s and compounds
+             dissipline   d@s@plin@ // fix stress and e sound: dissipline/-s/dissiplinebeleid, etc.
              distri (bu   d@str@ // distribusie/distribueer and compounds
           _) dis (t       d@s // stress: distrik/-te and compounds/distansie/distinksie/distorsie/distraksie
              distel       dIst@l // restore default stress: distel and compounds
@@ -852,7 +858,7 @@
      narkos) e (C         @ // fix e sound: narkosedood/-gas/-masker/-middel/-rekords, etc.
         ooi) e (C         @ // fix e sound: dooiepunt/ooievaar and similar
        trol) e (C@        @ // fix e sound in compounds: kontrolebank/-doeleindes/-kamer/-lys/-maatreël/-rekening...
-         @C) e (af        @_ // fix e sound: doodseise-/manne-/ongevalle-/troepeafdeling/slakkeafval
+         @C) e (aCC       @_ // fix e sound: doodseise-/manne-/ongevalle-/troepeafdeling/slakkeafval/handearbeid
           C) e (marie     @ //anemarie, lisemarie etc.
           n) eke (_       @k@ //anneke Heineke etc.
          @k) e (raad      @ // fix e sound: lekeraadslid/praktykeraad
@@ -915,6 +921,7 @@
          sp) e (d         @ // ekspedisie/gaspedaal/kwispedoor
          @C) ederm        @d&r@-m_ // fix e sounds: blindederm/-ontsteking/-operasie, etc.
         Cev) e (gK        & // fix e sound in compounds like buitegevegstelling/skietgevegte/boerevegters
+         @C) e (gd+       & // fix e sound: bloot-/selfopgelegde/boeregesegde
          @C) e (geC@      @ // fix e sound: Alpegebied/ambassadegebou/morfinegebruik, etc.
          &C) e (ganger    @ // fix e sound in compounds like sinodeganger/-s
          @w) e (gende     e@ // but: rond-/snel-/self-/traag-/voort-/vrybewegende
@@ -960,6 +967,7 @@
              entrepre (ne %A~ntr@pr@ // fix stress and vowel sounds: entrepreneur/-s and compounds
           C) e (pad       @ // fix e sound: (af/op)draandepad/hasepad
           C) e (pan       @ //fix e sound: instrumentepaneel/kolepan/liefdepand
+         @C) eps (+        Eps // fix e sound: biseps/triseps and similar
        Celm) e (tK        @ // fix e sound: helmet/pelmet and compounds
          @C) e (taal      @ // fix e sound: ape-/burokrate-/diewe-/engele-/gode-/leke-/siele-/skoliere-/tweetaal...
          @k) e (tt@+      E // menseketting/etikette
@@ -1102,6 +1110,7 @@
           &) elik (ing    @l@k // verduideliking/s/vergoddeliking/verstedeliking
           
           &) e (l_        @
+      blysp) e (lK        & // fix e sound: blyspel and compounds
       eiers) e (l         & // fix e sound: eiersel/-le/-letjie/-s
          kn) e (l         & // fix e sound: toe-/vasknel/-lend/-ling
         @sk) e (l         & // kwyt(ge)skeld(ing)
@@ -1135,6 +1144,7 @@
           &) e (lC_       @
          @m) e (ld        & // aanmeld/voormeld
         Csp) e (ld        & // fix e sound: borsspeld/haakspeld/doekspeld, etc.
+       gesp) e (ld        & // fix e sound: aanmekaargespeld/-e and similar
         Csp) e (ls        & // fix e sound: jakkalspels/penspels/lamspels and similar
              elagtig      @l'ax2t@x2 // beuselagtig/e/heid/buffelagtig...
              ener (gi     %En@r  // energie/energiek/e
@@ -1142,6 +1152,7 @@
           m) e (lend      @ // murmelend/wriemelende
           m) e (ling      @      // versameling/insameling/stameling
          &C) e (lrA       @ // fix e sound: // kreukelrig/kriewelrig/kronkelrig/wankelrig/wankelry and similar
+         @w) e (lsyn      & // fix e sound: dierewelsyn and similar
           _) eni (g       'e@n@  // enigeen/enigiemand/enigiets/eniggebore/enigermate
           C) e (ltjie     @      // eltjie always @lki
 
@@ -1206,7 +1217,7 @@
          rp) e (rCC       @ // fix e sound: ontwerpersbaadjie/purperkleurig, etc.
        purp) e (r         @ // fix e sound: purperband/-koors/-rooi/-suur/-wind
       _rasp) e (r         @ // fix e sound in rasper- compounds: raspertong/-vyl, etc./rasperend
-
+       werp) e (rsA       @ // fix e sound: ontwerpersolie/-sonbril/-uitrusting
         lew) e (ns        @
          &d) e (r@+       @      // not initial or final syllable
          @C) e (reë       @ // fix e sound: geelperskereën/tropereën, etc.
@@ -1311,6 +1322,7 @@
           _) evang        ,e@faNx2 // evangelie/evangelis
 
          ou) e (C         @
+         ou) e (a         @_ // fix e sound: vroueafdeling/-arbeid/-er
           C) e (v         @ //kleibevattend/stasiebevelvoerder/skadevergoeding
 
 // The following are experimental nasalisation of ens
@@ -1641,6 +1653,7 @@
              hart (roer   h%art // move default stress: hartroerend/-e/-ste
              hart (stogte_  h%art // move default stress: hartstogtelik
              hart (stogte_N hart // restore default stress: hartstogte
+             ha (we       hA: // fix stress and a sound: hawearbeider/lewendehaweafdeling
              he (bre      h%i // fix stress and 1st e sound: Hebreër/-s
              heeren (grac he@r@n // fix eng sounds: Heerengracht/-straat
              heerser      he@rs@r // fix e sound in compounds: heersers(drang/geslag/klas/mag/ras/volk)
@@ -1741,6 +1754,7 @@
              ieë (K       i:@ // knieë/vlieë/spieël/-tjie
          ss) ief (_       'if // move default stress: aggressief/massief/obsessief/progressief, etc.
          ss) iewe (_      'iv@ // move default stress: aggressiewe/massiewe/obsessiewe/progressiewe
+         ns) iewe (K      'iv@ // fix stress and e sound: intensiewesorg(eenheid) and similar
           h) i (dro       i //hidro in compounds
           h) i (drA       %i // fix stress and i sound: hidreer/hidrasie
           _) i (ko        %i // move default stress: ikoon/ikone
@@ -2266,6 +2280,8 @@
           _) kop (o       kOp? // fix o sound: koponder/koponderstebo/kopomdraai/kopoperasie
              kopu (lA     k%Op%y // fix o sound: kopulasie/kopuleer and derivatives
           _) kor (dA      k%Or // kordaat/kordon
+             ko (rint     k%u // fix stress and o sound: korint/-e and compounds
+             koren (t     k%urEn // fix stress and vowel sounds: korente and compounds
              korpo (raal  k%Orp@ // move default stress: korporaal/-s/-strepe/onderkorporaal
              ko (rrup     k%u // fix stress and 1st o sound: korrup/-sie/-te/-teer
              kor (set     k%Or // move default stress: korset/-te and compounds
@@ -2455,6 +2471,7 @@
              ma (tr       m%a // matriek and many compounds with matriek/matras/matroos/matrose
              ma (trikK    mA: // lengthen a sound: matriks/-e
           @) matig        m'A:t@x2 // doelmatig/gelykmatig/regmatig; matig takes stress in compounds
+             mayonnaise   m%eIj%uneI:z // mayonnaise and compounds
 //             mc           _^_EN // The mac names does not work
 
          CA) mme (C       m@
@@ -2513,8 +2530,8 @@
              moeite       m'uIt@    // moeitevol/le/moeiteloos/lose
              moe (ras     m%u // move default stress: moeras and compounds
              mohammed (a  m%uh%am@d // mohammedane/mohammedaan
-             moles (tA    mOl@s' // molesteer/der
-             moles (_     m%ulEs // fix stress and e sound: moles/huismoles
+             moles (tA    m%Ol@s // molesteer/der/kindermolestering
+             moles (K     m%ulEs // fix stress and e sound: moles/huismoles/molesmakers
              moles (te_   m%ulEs // fix stress and e sound: moleste and compounds
              mo (narg     m%o@ // move default stress: monarg/monargies
              monargie (_N m%o@n%arx2i // move stress to end: monargie
@@ -3327,6 +3344,7 @@
              pre (lud     pr@ // fix stress and e sound: prelude/-s/(ge)preludeer
              pre (mier    pr@ // move default stress and fix e sound: premier and compounds
              pre (nata    pr,e@ // fix e sound: prenataal/-tale
+             preste (rend pr@ste@ // fix stress and vowel sounds: presterend/-e
              pretori      pr%it%o@r%i //pretorianer,pretoriaan, fix e and o sounds a
              pretoria (_  pr%it'o@ria //ending in pretoria
              pretoria (C  prit'o@ria //pretoriase, pretoriahuis etc.
@@ -3347,6 +3365,7 @@
              predi (kant  pr%e@d@ // predikant and compounds
              prediker     pre@d@k@r // fix i sound: prediker/-s and compounds
              première     pr%imj&:r // fix stress and vowel sounds: première(ganger)
+             pri (maat    pr%i // fix stress: primaat/-spesie, etc.
              prinse (s    pr@nsE // prinses/-se|-sie/-s
           @) prinses (_   pr@nsEs // fix e sound in compounds ending in -prinses: feeprinses, etc.
              priv (a@     pr%if // privaat/private
@@ -3381,6 +3400,7 @@
              protes (te_N pr%utEs // proteste, but prevent breaking protestering
              protest      ,prOt@st
              proto (C     pro@tu // protokol/prototipe
+             prot (on+    pro@t // fix o sounds: proton/-e and compounds
              provi (and   pr%o@v%i // fix stress and v sound: proviand/-meester, etc.
              pseudo       sY@d%u // drop p sound: pseudo and compounds
              ps (igA      s // psigologie/kinderpsigoloog
@@ -3438,6 +3458,7 @@
              ritu (A      r@t%y // ritueel/rituele/ritualisties
              roersel      rurs@l // fix stress and e sound: roersele and compounds of roersel
           _) rol (A       rOl? // oprolaksie/roloorvleueling
+             roeme (nië   r%umi: // fix stress and e sound: Roemenië(r)
              roetine      r%utin@ // stress: roetine/-basis/-besoek/-kontrole...
              ro (ja       r%u // fix stress and o sound: rojaal/rojale
           _) roode        r'o@d@ //roodepoort and other names
@@ -3604,6 +3625,7 @@
              selek (CA    s@lEk //seleksie selekteer etc.
              sending (_   sEnd@N //fix sending at word end
              sen (sorie   s%En // move default stress: sensories/-e
+             senter       sEnt@r // fix e sound: binne-/buite-/Springboksenter
          @C) se (re_      se@ // fix penultimate e sound: bed-/brand-/keel-/kop-/kruip-/maag-/mond-/pitsere
              seroto (ni   s%Er@t%u // fix stress and vowel sounds: serotonien(vlakke, etc.)
              sitrus       s'itr%Ws_ //i sound and stress in compounds
@@ -3701,6 +3723,7 @@
              skadu        skA:dy // skaduagtig/skadutjie
              skaker (ing  sk%ake@r // skakering/-s/kleurskakering
              skan (da     sk%an // move default stress: skandaal/skandale/skandalig and compounds
+             skande (ring sk%ande@ // fix stress and e sound: (brein)skandering and similar compounds
           _) skar (C      sk%ar // move default stress: skarlaken/skarminkel/skarnier and many compounds
              skarrel      skar@l // restore default stress: (ge)skarrel/-ing
              ska (vot     sk%a // fix stress and a sound: skavot and compounds
@@ -3722,6 +3745,7 @@
           _) slag         sl'ax2
              slag (off    slax2_ // short a sound, insert pause: misdaadslagoffer and similar compounds
              sla (vin     sl%a // move default stress and shorten a sound: slavin/-ne and compounds
+             sla (we      slA: // fix stress and a sound: slawearbeid/-er, etc.
              slop (emmer  slOp_ // fix o sound and insert pause: slopemmer/-s
           @) sering       s'e@r@N    // analisering/kategorisering
           @) ses (_       s@s // fix 2 slb. words ending in ses
@@ -3743,6 +3767,7 @@
              sonne (t     s%unE // fix stress and vowel sounds: sonnet/-te/sonnetvorm
              so (nnetjie++ sO // but: sonnetjie/wintersonnetjie
              so (pra      s%u // move default stress and fix o sound: sopraan/soprane
+             sosa (ti     s%usA: // fix stress and o sound: sosatie and compounds
              sosio (-     so@Siu: // fix vowel sounds and stress: sosio-ekonomies/-e
              sou (ffleu   s%u // move default stress and fix o sound: suffleur/soffleuse
              span (dab    sp%an // move default stress: spandabel/-rig, etc.
@@ -4321,6 +4346,7 @@
              veel (jar    f%e@l // move default stress: veeljarig and derivatives
              veel (s@@    f%e@l // move default stress: veel(seggend/sellig/sinnig/soortig/stemmig/sydig)
              veg (een     f&x2_ // fix e sound: vegeenheid/-eenhede
+             veg (o       f&x2_ // fix e sound: (ge)vegopleiding/-offisier and similar
           A) ves (_       _^_EN // words ending in ves after vowel are English
 
              ve (l        f& // maagvel, stress on 1st slb
@@ -4575,6 +4601,7 @@
           @) weg (_       v&x2 // blindweg/botweg and many similar
       spoor) weg          v&x2 // fix e sound: spoorwegaanleg/-aansluiting/-amptenaar/-eiendom/-inkomste/-ongeluk...
           _) wegge (C@P5  v'&x2@ // prefix: weggeja and similar
+          K) weg (o       v&x2_ // fix e sound: gal-/lugwegobstruksie/snelwegoprit/wegoefen...
              weife (l     veIf@ // fix e sound: weifelloos/-lose/-loosheid
           _) weke (C      ve@k@ // fix 2nd e sound: wekelang/-e
              welbehaaglik v%&lb@hA:x2l@k // move default stress: welbehaaglik/-e/-er/-ste
@@ -4651,7 +4678,7 @@
           s) wedd (@      vEd       // beroepswedder
              wedywer      vEteIv@r // pronunc. of d and e-sound in derivatives
              weer (hou    v%e@r // exception to default stress rule
-          _) weer (sp     ve@r' // weerspreek/weersprekende/weerspreking/weerspannig/weerspieël
+          _) weer (sp     ve@r' // weerspreek/weersprekende/weerspreking/weerspannig/weerspieë«l
              weer (staan  v%e@r // weerstaan/onweerstaanbaar
          @C) wering (_    ve@r@N //borswering, diefwering etc.
 
@@ -4677,6 +4704,7 @@
              wood (+      _^_EN // English: Woodstock/Goodwood/Lynnwood
              woongewes    vo@nx2@vEs // fix stress and e sounds: woongewes/-te
          @C) w (ooC       v // fix w sound: eenmanswoonstel/handelswoorde/openingswoord/privaatwoonstel
+             worcester    vust@r // Worcester and compounds: worcestersous(bottel)
           @) ws (_N       _^_EN
           @) w (_N        _^_EN 
           @) werste (_    vIrst@
diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes
index b3cff29f..b01f3d00 100644
--- a/dictsource/dict_phonemes
+++ b/dictsource/dict_phonemes
@@ -494,3 +494,18 @@ g    h    j    J    k    kh   l    m
 n    N    n.   n^   p    ph   Q    r    
 r.   s    S    s.   t    t.   t.h  th   
 tS   x    z    
+
+
+Dictionary ne_dict
+
+@    @-   @2   @3   a    a:   aI   aU   
+a~   e    E    e:   E:   E~   e~   i    
+I    i:   i~   l-   o    O    o:   O:   
+o~   O~   r-   U    u    u:   u~   V    
+
+-    :    b    c    ch   d    d.   f    
+g    h    H    j    J    k    kh   l    
+l.   m    n    N    n.   n^   p    ph   
+Q    q    r    r.   s    S    s.   t    
+T    t.   t.h  th   v    w    x    z    
+z.   
diff --git a/dictsource/en_list b/dictsource/en_list
index c1138ed7..8208a1e8 100644
--- a/dictsource/en_list
+++ b/dictsource/en_list
@@ -768,7 +768,7 @@ competition      k0mp@t'IS@n
 compromise       k0mpr@maIz
 compound          $2           $verb 
 con              k0n
-conduct          k0ndVkt       $only
+conduct          k0ndVkt
 conduct                        $verb
 concert          k0ns3t        $onlys
 concert                        $verb
@@ -827,6 +827,7 @@ curate           kjU@reIt
 curse            k3:s
 ?5 curse         kVRs
 customer         k'Vst@m3
+cutaway          kVt@weI
 cutoff           kVt0f
 cutout           kVtaUt
 cyan             saI'an
@@ -838,11 +839,14 @@ damaged          d'amI2dZd
 dandelion        dandI2laI@n
 de               d@            $only
 debacle          deIb'A:k@L
+debrief          di:br'i:f
 debris           dEbri:
+debunk            $2
 debut            deIbju:
 decade           dEkeId
 decent           di:s@nt
 declaration      dEkl@'reIS@n
+decor            deIkO@
 decorative       dEkr@tIv
 decoy            di:kOI
 decry            dI2kraI
@@ -859,8 +863,9 @@ demolish         dI2m0lIS
 demon            di:m@n
 demo             dEmoU
 demonstrative     $2
-denouement       deIn'u:mO~
+dengue           dEngI
 denier           dI2naI3
+denouement       deIn'u:mO~
 deny             dI2naI
 denial           dI2naI@l
 depot            dEpoU
@@ -937,6 +942,7 @@ el               ,El
 electricity      I2lEktr'IsI2tI
 electrode        I2lEktroUd
 electron         I2lEktr0n
+elicit           I2lIsI2t
 eligible         ElI2dZ@b@L
 élite            Il'i:t
 email            i:meIl
@@ -1420,6 +1426,7 @@ myrrh            m3:
 
 naif             naI'i:f
 naïve            naI'i:v
+naked            neIkI2d
 nasa             nasa2
 nascent          neIs@nt
 nativity                       $2
@@ -1577,6 +1584,7 @@ pituitary                      $2
 plaguing         pleIgIN
 plicate           $2
 plugin           plVgIn
+plumber          plVm3
 plus             plVs
 poky             poUkI
 politer          p@l'aIt3
@@ -1809,6 +1817,7 @@ secrecy          si:kr@sI
 secret           si:kr@t
 secretive        si:kr@tIv
 secretary        sEkr@trI
+sedan            sI2dan
 sedate           sI2deIt
 seduce           sI2dju:s
 segue            sEgweI
@@ -1819,6 +1828,7 @@ semicolon        sEmIk'oUl@n
 senator          sEn@t3
 sens             sEns               // for sensible
 sentient         sEnti@nt
+sequester         $2
 sequine          si:kwI2n
 series           si:ri:z
 serene           s@ri:n
@@ -2019,7 +2029,6 @@ undo             Vnd'u:
 uni              ju:nI
 uninterest       Vn'Int@r@st
 university       ju:nIv'3:sI2tI
-unite            ju:n'aIt
 unless           Vnl'Es
 unread           Vnr'Ed        $only
 unsure           VnS'U@
@@ -2148,6 +2157,7 @@ Cambridge	keImbrIdZ
 Cheadle		tSi:d@L
 Cheshire	tSES3
 Chiswick	tSIzIk
+Clwyd		klu:Id
 Dolgellau	d0lg'EClaI
 Dover		doUv3
 Dumfries	dVmfr'i:s
@@ -2426,6 +2436,7 @@ Glynn		glIn
 Graeme		greI@m
 Graham		greI@m
 Hadrian		heIdri:@n
+Harriet		hari@t
 Hugh		hju:
 Hughes		hju:z
 Huw		hju:
diff --git a/dictsource/en_rules b/dictsource/en_rules
index 8f2de386..f54493f9 100644
--- a/dictsource/en_rules
+++ b/dictsource/en_rules
@@ -104,7 +104,6 @@
          m) a (jore      eI
          _) a (k@        a2
          @) a (ki_       'a
-         n) aked         eIkId
          @) ak (ia       ak
             aku (_       'A:ku:
             ao           eI0
@@ -539,7 +538,7 @@
          b) al (d        O:l
          b) al (k        O:l
          f) al (k        0l
-         b) all (_       O:l
+         b) all (K       O:l
         &b) all (er_     O:l
         _c) al (e        al
        _sc) al (A        eIl
@@ -973,7 +972,7 @@
             as (ive      'eIs
             as (ymp      as
          &) asy (_       @s%I
-         w) ast (e       eIst
+         w) aste         eIst
 
 .group at
        pal) ate (_       @t
@@ -1602,7 +1601,7 @@
             di (shC      dI
          _) di (shev+    dI2
          _) dis (hA      dI2s
-         _) di (si       ,dI
+         _) dis (inP3    ,dIs
             di (sint     dI2
             di (sk       dI
             di (sol      dI
@@ -2349,6 +2348,7 @@
          _) exc (e       %Eks
             exc (i       %Eks
             exc (elle    Eks
+            ex (e+       Eks
             exe (cutio   EksI
             ex (erc      Eks
          _) ex (A        %Egz
@@ -2709,7 +2709,8 @@
             iah (_       'aI@
             ia (m        I2@
          &) ia (n        i@
-         &) ia (n@       I'a
+         &) ia (nic      I'a
+         &) ia (na       I'a
             ia (ng_      ja
         _f) ia (nc       I'0
         _f) iance        I'0nseI
@@ -3121,6 +3122,7 @@
             it (i_       'i:t
             itius (_     'IS@s
             itis (_      'aItIs
+         &) it (ive_     =I2t
          &) itous        =It@s
          l) itre         i:t3
          n) it (rA       aIt
@@ -3421,6 +3423,7 @@
         XC) o (Bus_      oU
          @) o (Ci_       'oU
             o (Co_       'oU
+            o (Coist     'oU
          @) o (lo_       0
             o (Cic_      '0
             o (Cical     '0
@@ -3446,7 +3449,7 @@
             o (bligato   %0
             o (blo       0
         _r) o (ber       0
-         r) o (bot       oU
+        _r) o (bo        oU
          _) o (bs        %0
          _) obs (er      %0bz
             obso (l      0bs@
@@ -3536,6 +3539,7 @@
          @) o (ist       oU
             oix (_       wa
             o (ky_       oU
+         t) o (ngu       V
          &) oped (_      @pd
          _) o (per       0
          _) ope (n       oUp@
@@ -4716,6 +4720,7 @@
        man) u            ju:
       _sol) u (C         ju:
             u (a         ju:
+            u (a_        =ju:
          r) u (aC+         u:
         @g) ua (ge       wI
             uary (_      ju:@r%I
@@ -4807,6 +4812,7 @@
        min) u (te        I
        vac) uu           ju:
             uu (m        ju:@
+            u (xA+       V
          l) uxur         VgZu:3
             uy           aI
             uy (A_       'u:j
@@ -4875,13 +4881,14 @@
          _) un (exP2     ,Vn
          _) un (ic       ju:n
          _) un (imP2     ,Vn
-         _) unin         ,VnIn
+         _) unin         ,VnI2n
             un (inj      %Vn
          _) un (il       ,ju:n
          _) un (io       ju:n
          _) un (iq       %ju:n
          _) un (is       ju:n
          _) un (it       ju:n
+            unit (e      ju:n'aIt
          _) un (iv       ju:n
          _) un (ix       ju:n
             un (i        ju:n
@@ -4997,7 +5004,6 @@
 ?5      ss) wor (d       wVR
             wor (th_     w3:
 ?5          wor (th_     wVR
-         l) w (y         u:
          s) w (ick
 
 .group x
@@ -5080,6 +5086,7 @@
             yte (_       aIt
             you'         %ju:
             yu           ju:
+            yu (C%       jV
             yeo (C       joU
             y (er_       aI
          C) yes (_       aIz
diff --git a/dictsource/fr_list b/dictsource/fr_list
index fc18a3e4..7b5fddf2 100755
--- a/dictsource/fr_list
+++ b/dictsource/fr_list
@@ -24,7 +24,7 @@
 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated 2008-10-09 Michel Such  <michel.such@free.fr>
+// Updated 2008-10-13 Michel Such  <michel.such@free.fr>
 //
 //	* Numbers, a few abbreviations and exceptions.
 //
@@ -605,6 +605,7 @@ cocus     koky
 dernier    dE2rnjer2
 éloquent     ElokA~t2
 fan	f'an
+faut	fot2 $u+
 fier	      fier $verb
 fuel	      fjul
 gars	      ga
@@ -614,6 +615,7 @@ iris	      iris
 laser	      lazEr
 malus      malys
 mars	      mars
+mieux	mj'Y $u+
 ours	urs
 parangon	      parA~gO~
 phallus    falys
@@ -625,6 +627,8 @@ souris       suri
 sus       sys
 sus       sy $verb
 tuttiquanti       tutikw'anti
+vaut	$u+
+vaux	$u+
 vénus       venys
 vot       vOt
 
@@ -803,3 +807,4 @@ wallis	wAlis
 futuna	futuna
 zimbabwe	zimbabwe
 
+
diff --git a/dictsource/fr_rules b/dictsource/fr_rules
index 5dc23980..698d1f13 100755
--- a/dictsource/fr_rules
+++ b/dictsource/fr_rules
@@ -23,7 +23,7 @@
 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated: 2008-10-09 Michel Such  <michel.such@free.fr>
+// Updated: 2008-10-16 Michel Such  <michel.such@free.fr>
 //
 
 // Letter classes:
@@ -1211,6 +1211,7 @@ Vn)		t (_        t2
 
 	C)	u (bX      W	// hub, club
 	C)	u (gX      W	// bug, mug
+	r)	u (nX      W	// run, autorun
 		um (_       Om	// album
 	f) 	um (_     W~  // parfum
 		um (b       W~	// humble
@@ -1278,7 +1279,8 @@ Vn)		t (_        t2
 .group x
 		x           ks
                 xs          ks	// lexique lexicaux vox
-	_e) 	x (A        gz	// exagérer exemple
+	e) 	x (A        gz	// exagérer exemple
+	le) 	x (i        ks
 	_e) 	x (h        gz	// exhumer
 
 	ai) 	x (_ 		// voix paix prix
@@ -1355,3 +1357,4 @@ Vn)		t (_        t2
 
 
 
+
diff --git a/dictsource/hi_list b/dictsource/hi_list
index 6e8fb29b..41a4ea2f 100755
--- a/dictsource/hi_list
+++ b/dictsource/hi_list
@@ -155,6 +155,7 @@ _dpt      _d@s@ml'o:_        // ?? what is Hi for "." ?
 य      j@
 र      r@
 ऱ      r@
+ल      l@
 ळ      l.@
 व      v@
 श      S@
diff --git a/dictsource/hi_rules b/dictsource/hi_rules
index fc1a7c41..5c090c4e 100755
--- a/dictsource/hi_rules
+++ b/dictsource/hi_rules
@@ -2,7 +2,10 @@
 // This file is UTF8 encoded 
 
 // letter groups:
-// B - vowel signes and virama ्
+// A   vowel letters
+// B   vowel signs and virama ्
+// C   consonants
+// Y   vowel letters and vowel signs
 
 // conditional rules
 // ?1   drop schwa at end of word
@@ -349,14 +352,14 @@
 .group ळ
         ळ        l.V
         ळ (B     l.
-?1      ल (_     l.
-     ्) ल (_     l.V
+?1      ळ (_     l.
+     ्) ळ (_     l.V
 
 .group ऴ
         ऴ        l.V  // (temporary) same as [l.]
         ऴ (B     l.
-?1      ल (_     l.
-     ्) ल (_     l.V
+?1      ऴ (_     l.
+     ्) ऴ (_     l.V
 
 .group व
         व        vV
@@ -426,7 +429,8 @@
 .group ः
         ः        H   //  visarga
 
-
+.group ्		// virama
+	्
 
 // Extra consonants
 
diff --git a/phsource/compile_report b/phsource/compile_report
index 3bab8496..69c362b0 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -1,4 +1,4 @@
-53 phoneme tables
+54 phoneme tables
           new total
     base 100  100
    base2  24  119
@@ -50,9 +50,10 @@
       rw  15  126
       ko  18  147
       da  15  130
-      sq  23  129
+      sq  23  128
       ml  13  139
       bn  59  145
+      ne  14  141
 
 Data file      Used by
 b/b             [b] base
@@ -357,7 +358,6 @@ l/l             [l] base
                 [l] la
                 [l] pt
                 [l;] ro
-                [l] sq
 l/_l            [l] base
                 [l/] base
                 [l/3] base
@@ -374,7 +374,6 @@ l/_l            [l] base
                 [l] pt
                 [l;] ro
                 [l] zh
-                [l] sq
 l/l_            [l/] base
                 [l/3] base
                 [l/] fr
@@ -422,6 +421,7 @@ l/l_e           [(e)] base
                 [E2] fr
 l/L_eL_af       [&] af
                 [&:] af
+l/l_front       [l] sq
 l/li            [(i)] base
                 [i] fr
                 [i:] fr
@@ -1064,6 +1064,7 @@ vdiph/aau_2     [aU] en_wi
                 [aau] zhy
 vdiph/aau_3     [aU] hi
                 [aU] bn
+                [aU] ne
 vdiph/aau_4     [aU] vi
 vdiph/ae        [E:] fr_ca
                 [aI] la
@@ -1143,6 +1144,7 @@ vdiph/eu_2      [eu] fi
 vdiph/&i        [&i] fi
                 [aI] hi
                 [aI] bn
+                [aI] ne
 vdiph/@i_2      [eI] af
                 [@I] cy
                 [@Y] cy
@@ -1216,6 +1218,7 @@ vdiph/y#y_2     [Yy] af
                 [eoi] zhy
 vdiph/y#y_3     [Y:] nl
 vnasal/aa_n     [a~] bn
+                [a~] ne
 vnasal/aa_n2    [A~] en
                 [A~] fr
 vnasal/aa_n3    [A~] af
@@ -1232,9 +1235,11 @@ vnasal/ee_u_n   [E~] pl
 vnasal/e_n      [e~] af
                 [e~] pt
                 [e~] bn
+                [e~] ne
 vnasal/i_n      [i~] pt
                 [i~] bn
                 [i:~] bn
+                [i~] ne
 vnasal/m-       [m-] sw
 vnasal/n-       [n-] sw
 vnasal/nn-      [N-] sw
@@ -1254,6 +1259,7 @@ vnasal/u_n      [u~] hi
                 [u] zh
                 [u~] bn
                 [u:~] bn
+                [u~] ne
 vnasal/W_n      [E~] fr
                 [W~] fr
 voc/bh          [B] base
@@ -1373,6 +1379,7 @@ vowel/@_3       [@] en_sc
                 [@3] hi
                 [E#] sq
                 [@3] bn
+                [@3] ne
 vowel/3_2       [3:] en_n
                 [@] zh
 vowel/3_3       [3:] en_rp
@@ -1389,7 +1396,6 @@ vowel/8_2       [U] en_us
                 [8] sv
 vowel/8_3       [eo] zhy
 vowel/8_5       [8] ku
-vowel/8_6       [@] sq
 vowel/a         [a] en_n
                 [aa] en_n
                 [a] en_wm
@@ -1458,9 +1464,7 @@ vowel/a#_3      [a2] en
                 [a] bn
 vowel/a_4       [a/] el
                 [a] vi
-vowel/a_5       [a] fr
-                [a2] fr
-                [a:] ta
+vowel/a_5       [a:] ta
                 [a/] it
                 [a] la
                 [a] sv
@@ -1468,6 +1472,8 @@ vowel/a_5       [a] fr
                 [a] tr
                 [a] sq
                 [a:] ml
+vowel/a_6       [a] fr
+                [a2] fr
 vowel/aa        [a] fi
                 [A] fr_ca
                 [A] no
@@ -1495,13 +1501,15 @@ vowel/aa_7      [A] nl
 vowel/aa_8      [0] en_us
                 [A:] en_us
                 [V] ko
+vowel/aa_9      [a:] hi
+                [a:] bn
+                [a] ne
 vowel/a_en      [a] en
                 [aa] en
                 [A] fr
                 [a] pl
 vowel/@_bck     [@] hi
                 [@] zh
-                [V] sq
                 [@] bn
 vowel/e         [e] base2
                 [e:] en
@@ -1530,6 +1538,7 @@ vowel/e         [e] base2
                 [e] da
                 [e] ml
                 [e:] ml
+                [e] ne
 vowel/e#        [I] en_sc
                 [I2] en_sc
 vowel/e_2       [eI] en_sc
@@ -1637,6 +1646,7 @@ vowel/i         [i] base2
                 [i#] rw
                 [i] ko
                 [i:] ml
+                [i] ne
 vowel/i#        [y:] cy
 vowel/i_2       [i2] de
                 [i:] de
@@ -1736,6 +1746,7 @@ vowel/@_low     [3] en_rp
                 [@] bn
                 [V] bn
                 [@2] bn
+                [V] ne
 vowel/o         [o] base2
                 [o:] en
                 [oU] en_n
@@ -1785,9 +1796,9 @@ vowel/oe_4      [W] sv
 vowel/o_mid     [U@] en_rp
                 [O] fr
                 [O2] fr
-                [O~] fr
                 [o] hu
                 [o] tr
+                [o] ne
 vowel/oo        [O:] en_sc
                 [O] en_wi
                 [O:] en_wi
@@ -1825,10 +1836,10 @@ vowel/oo_4      [O] base2
                 [3:] en_wi
                 [O:] hi
                 [O] it
-                [O] sq
                 [O] bn
 vowel/oo_5      [O] pl
                 [O] is
+                [O] sq
 vowel/oo_en     [O] en
                 [O:] en
                 [O@] en
@@ -1907,6 +1918,7 @@ vowel/u_bck     [u] base2
                 [u] ko
                 [u] sq
                 [u:] bn
+                [u] ne
 vowel/u_bck2    [u:] la
 vowel/u_fnt     [u:] en_rp
 vowel/uu        [U] en
@@ -1939,10 +1951,13 @@ vowel/V_3       [V] en_rp
                 [V] hi
                 [V] ta
                 [V] bn
+                [V] ne
 vowel/V_4       [V] en_sc
                 [@:] vi
                 [V] da
 vowel/V_6       [V] en_us
+                [@] sq
+                [V] sq
 vowel/y         [y:] en
                 [y:] de
                 [y] fi
@@ -2050,8 +2065,6 @@ vwl_fr/r_e      [E] fr
 vwl_fr/r_u      [u] fr
 vwl_fr/r_y      [y] fr
 vwl_fr/w_a      [wA] fr
-vwl_hi/A        [a:] hi
-                [a:] bn
 vwl_hi/l-voc    [l-] jbo
                 [l-] hi
                 [l-] sk
diff --git a/phsource/ph_french b/phsource/ph_french
index 8e4edd48..9a4c9382 100644
--- a/phsource/ph_french
+++ b/phsource/ph_french
@@ -28,7 +28,7 @@ endphoneme
 phoneme a
   vowel  starttype (a)  endtype (a)
   length 170
-  formants vowel/a_5
+  formants vowel/a_6
   after  l l/la-15
   before l/ DFT+l/l_a
   before r/2 DFT-40+vwl_fr/r_a
@@ -39,7 +39,7 @@ endphoneme
 phoneme a2
   vowel  starttype (a)  endtype (a)
   length 150
-  formants vowel/a_5
+  formants vowel/a_6
   after  l l/la-15
   before l/ DFT+l/l_a
   before (r) DFT+r/xr
@@ -247,7 +247,7 @@ phoneme O~
   vowel  starttype (o)  endtype (o)
   length 200
   formants vnasal/o_n3
-  before n2 vowel/o_mid
+//  before n2 vowel/o_mid
 endphoneme
 
 
diff --git a/phsource/ph_hindi b/phsource/ph_hindi
index 3a0ae837..a72728a8 100644
--- a/phsource/ph_hindi
+++ b/phsource/ph_hindi
@@ -108,7 +108,7 @@ endphoneme
 phoneme a:
   vowel long starttype (a) endtype (a)
   length 230
-  formants vwl_hi/A
+  formants vowel/aa_9
 endphoneme
 
 phoneme a
diff --git a/phsource/phonemes b/phsource/phonemes
index 9af926c5..1cdd3b8c 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -1311,7 +1311,7 @@ include ph_korean
 phonemetable da is
 include ph_danish
 
-phonemetable sq es
+phonemetable sq base2
 include ph_albanian
 
 phonemetable ml hi
@@ -1320,3 +1320,5 @@ include ph_malayalam
 phonemetable bn hi
 include ph_bengali
 
+phonemetable ne hi
+include ph_nepali
diff --git a/phsource/vnasal/aa_n b/phsource/vnasal/aa_n
index 8b59e9e9..9f0ca6bf 100644
Binary files a/phsource/vnasal/aa_n and b/phsource/vnasal/aa_n differ
diff --git a/phsource/vnasal/e_n b/phsource/vnasal/e_n
index 74577c13..fddd7413 100644
Binary files a/phsource/vnasal/e_n and b/phsource/vnasal/e_n differ
diff --git a/src/Makefile b/src/Makefile
index 7f66159d..ab79ca05 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,7 +6,7 @@ INCDIR=$(PREFIX)/include/espeak
 LIBDIR=$(PREFIX)/lib
 DATADIR=$(PREFIX)/share/espeak-data
 
-RELEASE = 1.36
+RELEASE = 1.39
 BIN_NAME = speak
 BIN2_NAME = espeak
 LIB_NAME = libespeak.so
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index dbe7be43..a64fbeaa 100755
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.39.08  04.Oct.08";
+const char *version_string = "1.39.12  24.Oct.08";
 const int version_phdata  = 0x013900;
 
 int option_device_number = -1;
diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
index 315e3f56..9c8ad60d 100644
--- a/src/tr_languages.cpp
+++ b/src/tr_languages.cpp
@@ -350,7 +350,8 @@ Translator *SelectTranslator(const char *name)
 		}
 		break;
 
-	case L('h','i'):
+	case L('h','i'):    // Hindi
+	case L('n','e'):    // Nepali
 		{
 			static const short stress_lengths_hi[8] = {190, 190,  210, 210,  0, 0,  230, 250};
 			static const unsigned char stress_amps_hi[8] = {17,14, 20,19, 20,24, 24,22 };