Index: src/java/org/apache/fop/fonts/MultiByteFont.java
===================================================================
--- src/java/org/apache/fop/fonts/MultiByteFont.java	(revision 1099029)
+++ src/java/org/apache/fop/fonts/MultiByteFont.java	(working copy)
@@ -48,8 +48,7 @@
      * Default constructor
      */
     public MultiByteFont() {
-        // Make sure that the 3 first glyphs are included
-        subset.setupFirstThreeGlyphs();
+        subset.setupFirstGlyph();
 
         // Create a quasiunique prefix for fontname
         synchronized (this.getClass()) {
Index: src/java/org/apache/fop/fonts/CIDSubset.java
===================================================================
--- src/java/org/apache/fop/fonts/CIDSubset.java	(revision 1099029)
+++ src/java/org/apache/fop/fonts/CIDSubset.java	(working copy)
@@ -62,19 +62,12 @@
     }
 
     /**
-     * Adds the initial 3 glyphs which are the same for all CID subsets.
+     * Adds the first glyph which is reserved for .notdef for all CID subsets.
      */
-    public void setupFirstThreeGlyphs() {
-        // Make sure that the 3 first glyphs are included
+    public void setupFirstGlyph() {
         usedGlyphs.put(new Integer(0), new Integer(0));
         usedGlyphsIndex.put(new Integer(0), new Integer(0));
         usedGlyphsCount++;
-        usedGlyphs.put(new Integer(1), new Integer(1));
-        usedGlyphsIndex.put(new Integer(1), new Integer(1));
-        usedGlyphsCount++;
-        usedGlyphs.put(new Integer(2), new Integer(2));
-        usedGlyphsIndex.put(new Integer(2), new Integer(2));
-        usedGlyphsCount++;
     }
 
     /**