diff --git a/ChangeLog b/ChangeLog
index 3eef5ab..4ff3a07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-10-25  Jinghua Luo  <sunmoon1997@gmail.com>
+	reviewed by: plam
+
+	* fontconfig/fonts.conf.in:
+	* fontconfig/fontconfig.h:
+	* src/fcdefault.c:
+	* src/fcname.c:
+
+	Add FC_EMBEDDED_BITMAP object type to tell Xft/Cairo whether
+	to load embedded bitmaps or not.
+
 2005-10-25  Patrick Lam  <plam@mit.edu>
 	* src/fcfreetype.c (FcFreeTypeQuery):
 
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 36982f4..bff1058 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -102,6 +102,7 @@ typedef int		FcBool;
 #define FC_CAPABILITY       "capability"	/* String */
 #define FC_FONTFORMAT	    "fontformat"	/* String */
 #define FC_EMBOLDEN	    "embolden"		/* Bool - true if emboldening needed*/
+#define FC_EMBEDDED_BITMAP  "embeddedbitmap"	/* Bool - true to enable embedded bitmaps */
 
 #define FC_DIR_CACHE_FILE	    "fonts.cache-"FC_CACHE_VERSION
 #define FC_USER_CACHE_FILE	    ".fonts.cache-"FC_CACHE_VERSION
diff --git a/fonts.conf.in b/fonts.conf.in
index 869fec1..4f7a308 100644
--- a/fonts.conf.in
+++ b/fonts.conf.in
@@ -341,6 +341,10 @@
 		<edit name="slant" mode="assign">
 			<const>oblique</const>
 		</edit>
+                <!-- and disable embedded bitmaps for artificial oblique -->
+                <edit name="embeddedbitmap" mode="assign">
+                        <bool>false</bool>
+                </edit>
 	</match>
 
 <!--
diff --git a/src/fcdefault.c b/src/fcdefault.c
index 956862c..c309ef6 100644
--- a/src/fcdefault.c
+++ b/src/fcdefault.c
@@ -33,6 +33,7 @@ static struct {
     { FC_VERTICAL_LAYOUT,   FcFalse	},  /* FC_LOAD_VERTICAL_LAYOUT */
     { FC_AUTOHINT,	    FcFalse	},  /* FC_LOAD_FORCE_AUTOHINT */
     { FC_GLOBAL_ADVANCE,    FcTrue	},  /* !FC_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH */
+    { FC_EMBEDDED_BITMAP,   FcTrue 	},  /* !FC_LOAD_NO_BITMAP */
 };
 
 #define NUM_FC_BOOL_DEFAULTS	(int) (sizeof FcBoolDefaults / sizeof FcBoolDefaults[0])
diff --git a/src/fcname.c b/src/fcname.c
index 825a7d5..0767e11 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -72,6 +72,7 @@ static const FcObjectType _FcBaseObjectTypes[] = {
     { FC_CAPABILITY,	FcTypeString },
     { FC_FONTFORMAT,	FcTypeString },
     { FC_EMBOLDEN,	FcTypeBool },
+    { FC_EMBEDDED_BITMAP,   FcTypeBool },
 };
 
 #define NUM_OBJECT_TYPES    (sizeof _FcBaseObjectTypes / sizeof _FcBaseObjectTypes[0])