diff --git a/ChangeLog b/ChangeLog
index da55196..511cbd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-27 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/cairo/CairoFontEnumerator.m,
+	* Source/xlib/GSXftFontInfo.m: Use DejaVu as another fallback
+	font, as Bitstream Vera and FreeSans are no longer supplied
+	directly by Debian.
+
 2009-07-13 Fred Kiefer <FredKiefer@gmx.de>
 
         * Source/winlib/WIN32GState.m (-_paintPath:) Only draw when the
diff --git a/Source/cairo/CairoFontEnumerator.m b/Source/cairo/CairoFontEnumerator.m
index 2315fac..7dd9fc5 100644
--- a/Source/cairo/CairoFontEnumerator.m
+++ b/Source/cairo/CairoFontEnumerator.m
@@ -207,6 +207,8 @@ static NSArray *faFromFc(FcPattern *pat)
     return @"Bitstream Vera Sans";
   if ([allFontNames containsObject: @"FreeSans"])
     return @"FreeSans";
+  if ([allFontNames containsObject: @"DejaVu Sans"])
+    return @"DejaVu Sans";
   return @"Helvetica";
 }
 
@@ -216,6 +218,8 @@ static NSArray *faFromFc(FcPattern *pat)
     return @"Bitstream Vera Sans-Bold";
   if ([allFontNames containsObject: @"FreeSans-Bold"])
     return @"FreeSans-Bold";
+  if ([allFontNames containsObject: @"DejaVu Sans-Bold"])
+    return @"DejaVu Sans-Bold";
   return @"Helvetica-Bold";
 }
 
@@ -225,6 +229,8 @@ static NSArray *faFromFc(FcPattern *pat)
     return @"Bitstream Vera Sans Mono";
   if ([allFontNames containsObject: @"FreeMono"])
     return @"FreeMono";
+  if ([allFontNames containsObject: @"DejaVu Sans Mono"])
+    return @"DejaVu Sans Mono";
   return @"Courier";
 }
 
diff --git a/Source/xlib/GSXftFontInfo.m b/Source/xlib/GSXftFontInfo.m
index fdcdcd5..c21bc5c 100644
--- a/Source/xlib/GSXftFontInfo.m
+++ b/Source/xlib/GSXftFontInfo.m
@@ -229,6 +229,8 @@ static NSArray *faFromFc(FcPattern *pat)
     return @"Bitstream Vera Sans";
   if ([allFontNames containsObject: @"FreeSans"])
     return @"FreeSans";
+  if ([allFontNames containsObject: @"DejaVu Sans"])
+    return @"DejaVu Sans";
   return @"Helvetica";
 }
 
@@ -238,6 +240,8 @@ static NSArray *faFromFc(FcPattern *pat)
     return @"Bitstream Vera Sans-Bold";
   if ([allFontNames containsObject: @"FreeSans-Bold"])
     return @"FreeSans-Bold";
+  if ([allFontNames containsObject: @"DejaVu Sans-Bold"])
+    return @"DejaVu Sans-Bold";
   return @"Helvetica-Bold";
 }
 
@@ -247,6 +251,8 @@ static NSArray *faFromFc(FcPattern *pat)
     return @"Bitstream Vera Sans Mono";
   if ([allFontNames containsObject: @"FreeMono"])
     return @"FreeMono";
+  if ([allFontNames containsObject: @"DejaVu Sans Mono"])
+    return @"DejaVu Sans Mono";
   return @"Courier";
 }