diff --git a/Encode.cabal b/Encode.cabal
--- a/Encode.cabal
+++ b/Encode.cabal
@@ -1,9 +1,9 @@
 name:               Encode
-version:            1.1
+version:            1.2
 license:            GPL
 license-file:       LICENSE
 extra-source-files: INSTALL, LicenseBSD, LicenseGPL, Setup.PL
-copyright:          2008
+copyright:          2009
 author:             Otakar Smrz
 maintainer:         otakar.smrz mff.cuni.cz
 homepage:           http://ufal.mff.cuni.cz/~smrz/
diff --git a/Encode.hs b/Encode.hs
--- a/Encode.hs
+++ b/Encode.hs
@@ -1,11 +1,11 @@
 -- --------------------------------------------------------------------------
---  $Revision: 548 $ $Date: 2008-05-06 01:23:06 +0200 (Tue, 06 May 2008) $
+--  $Revision: 808 $ $Date: 2009-02-10 00:19:07 +0100 (Tue, 10 Feb 2009) $
 -- --------------------------------------------------------------------------
 
 -- |
 --
 -- Module      :  Encode
--- Copyright   :  Otakar Smrz 2005-2008
+-- Copyright   :  Otakar Smrz 2005-2009
 -- License     :  BSD-style
 --
 -- Maintainer  :  otakar.smrz mff.cuni.cz
@@ -39,7 +39,7 @@
     
 import Version
 
-version = revised "$Revision: 548 $"
+version = revised "$Revision: 808 $"
 
 
 -- | The datatype introduced for the internal representation of Unicode code
diff --git a/Encode/Arabic.hs b/Encode/Arabic.hs
--- a/Encode/Arabic.hs
+++ b/Encode/Arabic.hs
@@ -1,11 +1,11 @@
 -- --------------------------------------------------------------------------
---  $Revision: 542 $ $Date: 2008-04-25 23:34:45 +0200 (Fri, 25 Apr 2008) $
+--  $Revision: 808 $ $Date: 2009-02-10 00:19:07 +0100 (Tue, 10 Feb 2009) $
 -- --------------------------------------------------------------------------
 
 -- |
 --
 -- Module      :  Encode.Arabic
--- Copyright   :  Otakar Smrz 2005-2008
+-- Copyright   :  Otakar Smrz 2005-2009
 -- License     :  GPL
 --
 -- Maintainer  :  otakar.smrz mff.cuni.cz
@@ -45,4 +45,4 @@
 
 import Version
 
-version = revised "$Revision: 542 $"
+version = revised "$Revision: 808 $"
diff --git a/Encode/Arabic/ArabTeX/ZDMG.hs b/Encode/Arabic/ArabTeX/ZDMG.hs
--- a/Encode/Arabic/ArabTeX/ZDMG.hs
+++ b/Encode/Arabic/ArabTeX/ZDMG.hs
@@ -1,11 +1,11 @@
 -- --------------------------------------------------------------------------
---  $Revision: 667 $ $Date: 2008-08-12 15:36:28 +0200 (Tue, 12 Aug 2008) $
+--  $Revision: 808 $ $Date: 2009-02-10 00:19:07 +0100 (Tue, 10 Feb 2009) $
 -- --------------------------------------------------------------------------
 
 -- |
 --
 -- Module      :  Encode.Arabic.ArabTeX.ZDMG
--- Copyright   :  Otakar Smrz 2005-2008
+-- Copyright   :  Otakar Smrz 2005-2009
 -- License     :  GPL
 --
 -- Maintainer  :  otakar.smrz mff.cuni.cz
@@ -39,7 +39,7 @@
 
 import Version
 
-version = revised "$Revision: 667 $"
+version = revised "$Revision: 808 $"
 
 
 data ZDMG = ZDMG | ArabTeX_ZDMG
@@ -539,21 +539,21 @@
         "uu"    |-|     "U"     |:|     []      |+|
         "aa"    |-|     "A"     |:|     []
 
-        -- -- |+| anyof [
-        --
-        --             "iy" ++ v   |-|     "y" ++ v        |:| ["i"]   |+|
-        --             "uw" ++ v   |-|     "w" ++ v        |:| ["u"]
-        --
-        --         |   v <- elems [vowel] ++ quote [vowel, sukun] ]
+        |+| anyof [
 
+                    "iy" ++ v   |-|     "y" ++ v        |:| ["i", "|"]  |+|
+                    "uw" ++ v   |-|     "w" ++ v        |:| ["u", "|"]
 
+                |   v <- elems [vowel] ++ quote [vowel, sukun] ]
+
+
 ruleHyphenedVowel =
 
         anyof [
-                    "-"  ++ v   |-|     v               |:| []      |+|
+                    "-"  ++ v   |-|     v               |:| []          |+|
 
-                    -- "iy-" ++ v  |-|     "y-" ++ v       |:| ["i"]   |+|
-                    -- "uw-" ++ v  |-|     "w-" ++ v       |:| ["u"]   |+|
+                    "iy-" ++ v  |-|     "y-" ++ v       |:| ["i", "|"]  |+|
+                    "uw-" ++ v  |-|     "w-" ++ v       |:| ["u", "|"]  |+|
 
                     "W-" ++ v   |-|     "W"             |:| [v]
 
diff --git a/Encode/Mapper.hs b/Encode/Mapper.hs
--- a/Encode/Mapper.hs
+++ b/Encode/Mapper.hs
@@ -1,5 +1,5 @@
 -- --------------------------------------------------------------------------
---  $Revision: 264 $ $Date: 2007-04-13 18:24:56 +0200 (Fri, 13 Apr 2007) $
+--  $Revision: 776 $ $Date: 2008-12-17 23:35:39 +0100 (Wed, 17 Dec 2008) $
 -- --------------------------------------------------------------------------
 
 -- |
@@ -62,7 +62,7 @@
 
 import Version
 
-version = revised "$Revision: 264 $"
+version = revised "$Revision: 776 $"
 
 {-
 (?) x y = Map.lookup y x
@@ -522,15 +522,15 @@
 --parseLongest :: Ord s => Mapper s a -> [s] -> [a]
 parseLongest :: (Ord s, Eq a, Show a) => Mapper s (Quit s a) -> [s] -> [a]
 
-parseLongest = parseLongestCheck
---parseLongest = parseLongestWide
+parseLongest = parseLongestWide
+            -- parseLongestCheck
 
 
 --parseLongestWith :: Ord s => ([[[a]]] -> [a]) -> Mapper s a -> [s] -> [a]
 parseLongestWith :: (Ord s, Eq b, Show b) => ([[[a]]] -> [b]) -> Mapper s (Quit s a) -> [s] -> [b]
 
-parseLongestWith = parseLongestCheckWith
---parseLongestWith = parseLongestWideWith
+parseLongestWith = parseLongestWideWith
+                -- parseLongestCheckWith
 
 
 parseLongestCheck :: (Ord s, Eq a, Show a) => Mapper s (Quit s a) -> [s] -> [a]
diff --git a/Exec/Decode/Main.hs b/Exec/Decode/Main.hs
--- a/Exec/Decode/Main.hs
+++ b/Exec/Decode/Main.hs
@@ -1,11 +1,11 @@
 -- --------------------------------------------------------------------------
---  $Revision: 747 $ $Date: 2008-11-07 22:53:30 +0100 (Fri, 07 Nov 2008) $
+--  $Revision: 808 $ $Date: 2009-02-10 00:19:07 +0100 (Tue, 10 Feb 2009) $
 -- --------------------------------------------------------------------------
 
 -- |
 --
 -- Module      :  Exec.Decode.Main
--- Copyright   :  Otakar Smrz 2005-2008
+-- Copyright   :  Otakar Smrz 2005-2009
 -- License     :  GPL
 --
 -- Maintainer  :  otakar.smrz mff.cuni.cz
@@ -33,7 +33,7 @@
 
 version = Version [1, 1, build] []
 
-    where Version [build] [] = revised "$Revision: 747 $"
+    where Version [build] [] = revised "$Revision: 808 $"
 
 
 data Opts = DisplayUsage | PrintVersion | LineOriented |
@@ -61,7 +61,7 @@
                                                 "show program's version" ]
 
 
-copyleft = unlines ["Encode Arabic (C) 2008-2005 Otakar Smrz",
+copyleft = unlines ["Encode Arabic (C) 2009-2005 Otakar Smrz",
                     "GNU General Public License http://www.gnu.org/licenses/"]
 
 synopsis = unlines [copyleft,
@@ -82,7 +82,7 @@
                 PrintVersion : _    ->  warn (unlines [copyleft,
                                               unwords ["Encode Arabic",
                                                        showVersion Main.version,
-                                                       "November 2008"]])
+                                                       "February 2009"]])
                 LineOriented : _    ->  execute True (tail opts) nons
                 _                   ->  execute False      opts  nons
 
diff --git a/Exec/Encode/Main.hs b/Exec/Encode/Main.hs
--- a/Exec/Encode/Main.hs
+++ b/Exec/Encode/Main.hs
@@ -1,11 +1,11 @@
 -- --------------------------------------------------------------------------
---  $Revision: 747 $ $Date: 2008-11-07 22:53:30 +0100 (Fri, 07 Nov 2008) $
+--  $Revision: 808 $ $Date: 2009-02-10 00:19:07 +0100 (Tue, 10 Feb 2009) $
 -- --------------------------------------------------------------------------
 
 -- |
 --
 -- Module      :  Exec.Encode.Main
--- Copyright   :  Otakar Smrz 2005-2008
+-- Copyright   :  Otakar Smrz 2005-2009
 -- License     :  GPL
 --
 -- Maintainer  :  otakar.smrz mff.cuni.cz
@@ -33,7 +33,7 @@
 
 version = Version [1, 1, build] []
 
-    where Version [build] [] = revised "$Revision: 747 $"
+    where Version [build] [] = revised "$Revision: 808 $"
 
 
 data Opts = DisplayUsage | PrintVersion | LineOriented |
@@ -61,7 +61,7 @@
                                                 "show program's version" ]
 
 
-copyleft = unlines ["Encode Arabic (C) 2008-2005 Otakar Smrz",
+copyleft = unlines ["Encode Arabic (C) 2009-2005 Otakar Smrz",
                     "GNU General Public License http://www.gnu.org/licenses/"]
 
 synopsis = unlines [copyleft,
@@ -82,7 +82,7 @@
                 PrintVersion : _    ->  warn (unlines [copyleft,
                                               unwords ["Encode Arabic",
                                                        showVersion Main.version,
-                                                       "November 2008"]])
+                                                       "February 2009"]])
                 LineOriented : _    ->  execute True (tail opts) nons
                 _                   ->  execute False      opts  nons
 
diff --git a/LicenseBSD b/LicenseBSD
--- a/LicenseBSD
+++ b/LicenseBSD
@@ -1,4 +1,4 @@
-Copyright 2005-2007 Otakar Smrz. All rights reserved.
+Copyright 2005-2009 Otakar Smrz. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
diff --git a/Setup.PL b/Setup.PL
--- a/Setup.PL
+++ b/Setup.PL
@@ -4,9 +4,9 @@
 #
 # Building Encode ##############################################################################
 
-# $Id: Setup.PL 748 2008-11-07 22:31:28Z smrz $
+# $Id: Setup.PL 808 2009-02-09 23:19:07Z smrz $
 
-our $VERSION = do { q $Revision: 748 $ =~ /(\d+)/; sprintf "%4.2f", $1 / 100 };
+our $VERSION = join '.', 1, 2, q $Revision: 808 $ =~ /(\d+)/;
 
 
 use File::Spec;
@@ -18,9 +18,9 @@
     return File::Spec->join(split ' ', $_[0]);
 }
 
-    $DdotsEncodeExecbin = path "... Encode bin";
+    $DdotsEncodeExecbin = path "..... Encode bin";
 
-    $Ddots = path "...";
+    $Ddots = path ".....";
     
     $Dbin = path ". bin";
     $Ddoc = path ". doc";
@@ -204,7 +204,7 @@
     close I;
 
 
-    $name = "Encode-Exec-" . $ver . "-built-" . $^O;
+    $name = "Encode-" . $ver . "-Exec-" . $^O;
 
     system "tar -cf " . $name . ".tar" . " Encode";