diff --git a/ChangeLog b/ChangeLog
index 360861bef..b034bb043 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-12  Werner Lemberg  <wl@gnu.org>
+
+	* configure: Output more variables to the created Makefile so that
+	it can be used for ft2demos also (if the FT2DEMOS variable is
+	defined).
+
 2005-02-10  David Turner  <david@freetype.org>
 
 	* src/pfr/pfrgload.c (pfr_glyph_load): Fix an unbounded growing
diff --git a/configure b/configure
index 8621c0e5a..babb946c3 100644
--- a/configure
+++ b/configure
@@ -51,12 +51,19 @@ abs_ft2_dir=`cd "$ft2_dir" && pwd`
 
 if test "$abs_curr_dir" != "$abs_ft2_dir"; then
   mkdir reference
-  echo "TOP_DIR=$abs_ft2_dir"             > Makefile
-  echo "OBJ_DIR=$abs_curr_dir"           >> Makefile
-  echo "OBJ_BUILD=$abs_curr_dir"         >> Makefile
-  echo "DOC_DIR=$abs_curr_dir/reference" >> Makefile
-  echo "LIBTOOL=$abs_curr_dir/libtool"   >> Makefile
-  echo "include $abs_ft2_dir/Makefile"   >> Makefile
+  echo "TOP_DIR   := $abs_ft2_dir"               > Makefile
+  echo "OBJ_DIR   := $abs_curr_dir"             >> Makefile
+  echo "OBJ_BUILD := \$(OBJ_DIR)"               >> Makefile
+  echo "DOC_DIR   := \$(OBJ_DIR)/reference"     >> Makefile
+  echo "LIBTOOL   := \$(OBJ_DIR)/libtool"       >> Makefile
+  echo "ifndef FT2DEMOS"                        >> Makefile
+  echo "  include \$(TOP_DIR)/Makefile"         >> Makefile
+  echo "else"                                   >> Makefile
+  echo "  TOP_DIR_2 := \$(TOP_DIR)/../ft2demos" >> Makefile
+  echo "  PROJECT   := freetype"                >> Makefile
+  echo "  CONFIG_MK := \$(OBJ_DIR)/config.mk"   >> Makefile
+  echo "  include \$(TOP_DIR_2)/Makefile"       >> Makefile
+  echo "endif"                                  >> Makefile
 fi
 
 # call make