diff --git a/debian/changelog b/debian/changelog
index 302811a1..93874443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ xkeyboard-config (1.5~20090108.1-1) UNRELEASED; urgency=low
   * debian/patches:
     - Refresh patches
     - Remove patches applied upstream
+  * Add typographic option 
 
- -- Alexey Ten (Lynn) <alexeyten+ppa@gmail.com>  Fri, 09 Jan 2009 02:34:55 +0300
+ -- Alexey Ten (Lynn) <alexeyten+ppa@gmail.com>  Fri, 09 Jan 2009 21:44:02 +0300
 
 xkeyboard-config (1.3-2ubuntu4) intrepid; urgency=low
 
diff --git a/rules/base.l1o_s.part b/rules/base.l1o_s.part
index 5544d538..d76e3240 100644
--- a/rules/base.l1o_s.part
+++ b/rules/base.l1o_s.part
@@ -1 +1,3 @@
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):1
+  $alllayouts		typo:default = +typo(default):1
+  $threelevellayouts	typo:default = +%l[1]%(v[1]):1
diff --git a/rules/base.l2o_s.part b/rules/base.l2o_s.part
index 3ffd6a8b..4c7dec03 100644
--- a/rules/base.l2o_s.part
+++ b/rules/base.l2o_s.part
@@ -1 +1,3 @@
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):2
+  $alllayouts		typo:default = +typo(default):2
+  $threelevellayouts	typo:default = +%l[2]%(v[2]):2
diff --git a/rules/base.l3o_s.part b/rules/base.l3o_s.part
index aa327eb4..d16f6177 100644
--- a/rules/base.l3o_s.part
+++ b/rules/base.l3o_s.part
@@ -1 +1,3 @@
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):3
+  $alllayouts		typo:default = +typo(default):3
+  $threelevellayouts	typo:default = +%l[3]%(v[3]):3
diff --git a/rules/base.l4o_s.part b/rules/base.l4o_s.part
index 79682503..5d0e3116 100644
--- a/rules/base.l4o_s.part
+++ b/rules/base.l4o_s.part
@@ -1 +1,3 @@
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle):4
+  $alllayouts		typo:default = +typo(default):4
+  $threelevellayouts	typo:default = +%l[4]%(v[4]):4
diff --git a/rules/base.lists.part b/rules/base.lists.part
index e1897b13..53886f64 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -87,3 +87,25 @@
               vn \
               za
 
+// ALL layouts
+! $alllayouts = ad af al am ara az \
+              ba bd be bg br braille bt by \
+              ca cd ch cn cs cz \
+              de dk \
+              ee epo es et \
+              fi fo fr \
+              gb ge gh gn gr \
+              hr hu \
+              ie il in iq ir is it \
+              jp \
+              kg kh kr kz \
+              la latam lk lt lv \
+              ma mao me mk mm mn mt mv \
+              ng nl no np \
+              pk pl pt \
+              ro rs ru \
+              se si sk sy \
+              th tj tr \
+              ua us uz \
+              vn \
+              za
diff --git a/rules/base.lo_s.part b/rules/base.lo_s.part
index c491f079..d2ac882c 100644
--- a/rules/base.lo_s.part
+++ b/rules/base.lo_s.part
@@ -1 +1,3 @@
   $threelevellayouts	grp:alts_toggle = +level3(ralt_switch_for_alts_toggle)
+  $alllayouts		typo:default = +typo(default)
+  $threelevellayouts	typo:default = +%l%(v)
diff --git a/rules/base.xml.in b/rules/base.xml.in
index bd5ba3af..7166c0e1 100644
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -4746,6 +4746,18 @@
         </configItem>
       </option>
     </group>
+    <group allowMultipleSelection="true">
+      <configItem>
+        <name>typo</name>
+        <_description>Adding typographic layout</_description>
+      </configItem>
+      <option>
+        <configItem>
+          <name>typo:default</name>
+          <_description>Default</_description>
+        </configItem>
+      </option>
+    </group>
     <group allowMultipleSelection="true">
       <!-- Special shortcuts for the Euro character -->
       <configItem>
diff --git a/symbols/typo b/symbols/typo
new file mode 100644
index 00000000..6a4f323b
--- /dev/null
+++ b/symbols/typo
@@ -0,0 +1,40 @@
+// $XKeyboardConfig$
+
+partial
+xkb_symbols "default" {
+  key <TLDE> { [ NoSymbol, NoSymbol, acute, approxeq ] };
+  key <AE01> { [ NoSymbol, NoSymbol, onesuperior ] };
+  key <AE02> { [ NoSymbol, NoSymbol, twosuperior ] };
+  key <AE03> { [ NoSymbol, NoSymbol, threesuperior ] };
+  key <AE04> { [ NoSymbol, NoSymbol, section ] };
+  key <AE05> { [ NoSymbol, NoSymbol, U2030 ] }; // PER MILLE SIGN
+  key <AE11> { [ NoSymbol, NoSymbol, emdash, hyphen ] };
+  key <AE12> { [ NoSymbol, NoSymbol, notequal, plusminus ] };
+
+  key <AD01> { [ NoSymbol, NoSymbol, NoSymbol, onequarter ] };
+  key <AD03> { [ NoSymbol, NoSymbol, EuroSign, oneeighth ] };
+  key <AD04> { [ NoSymbol, NoSymbol, registered ] };
+  key <AD05> { [ NoSymbol, NoSymbol, trademark, onethird ] };
+  key <AD09> { [ NoSymbol, NoSymbol, degree ] };
+  key <AD10> { [ NoSymbol, NoSymbol, minutes, seconds ] };
+  key <AD11> { [ NoSymbol, NoSymbol, U2039 ] }; // SINGLE LEFT-POINTING ANGLE QUOTATION MARK
+  key <AD12> { [ NoSymbol, NoSymbol, U203A ] }; // SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
+  key <BKSL> { [ NoSymbol, NoSymbol, endash, enfilledcircbullet ] };
+
+  key <AC01> { [ NoSymbol, NoSymbol, approxeq ] };
+  key <AC02> { [ NoSymbol, NoSymbol, section ] };
+  key <AC03> { [ NoSymbol, NoSymbol, degree ] };
+  key <AC04> { [ NoSymbol, NoSymbol, sterling ] };
+  key <AC06> { [ NoSymbol, NoSymbol, NoSymbol, onehalf ] };
+  key <AC07> { [ NoSymbol, NoSymbol, doublelowquotemark, singlelowquotemark ] };
+  key <AC08> { [ NoSymbol, NoSymbol, leftdoublequotemark, leftsinglequotemark ] };
+  key <AC09> { [ NoSymbol, NoSymbol, rightdoublequotemark, rightsinglequotemark ] };
+  key <AC10> { [ NoSymbol, NoSymbol, leftsinglequotemark, diaeresis ] };
+  key <AC11> { [ NoSymbol, NoSymbol, rightsinglequotemark, minutes ] };
+
+  key <AB02> { [ NoSymbol, NoSymbol, multiply, periodcentered ] };
+  key <AB03> { [ NoSymbol, NoSymbol, copyright ] };
+  key <AB08> { [ NoSymbol, NoSymbol, guillemotleft, doublelowquotemark ] };
+  key <AB09> { [ NoSymbol, NoSymbol, guillemotright, leftdoublequotemark ] };
+  key <AB10> { [ NoSymbol, NoSymbol, ellipsis, U2215 ] }; // DIVISION SLASH
+};