diff --git a/build-common.xml b/build-common.xml
index 1715419aeb1b8ba1fd2bec762809efbfc2da8126..7d7504ff662d459ed455ea5edbf88f1ab3b98967 100644
--- a/build-common.xml
+++ b/build-common.xml
@@ -25,7 +25,7 @@
 	<target name='compile'>
 		<mkdir dir='build'/>
 		<javac srcdir='net/sf/briar' destdir='build' source='1.5'
-			includeantruntime='false'>
+			includeantruntime='false' debug='on'>
 			<classpath>
 				<fileset refid='bundled-jars'/>
 				<fileset refid='test-jars'/>
diff --git a/components/net/sf/briar/i18n/FontManagerImpl.java b/components/net/sf/briar/i18n/FontManagerImpl.java
index 783b6bef4efc039693deb35ce5d7e7d77a48a3d9..142829d4b39f8da99d321ff724354b962d31f697 100644
--- a/components/net/sf/briar/i18n/FontManagerImpl.java
+++ b/components/net/sf/briar/i18n/FontManagerImpl.java
@@ -35,6 +35,8 @@ public class FontManagerImpl implements FontManager {
 		new BundledFont("TibetanMachineUni.ttf", 14f, new String[] { "bo" }),
 		// Use Padauk for Burmese
 		new BundledFont("Padauk.ttf", 14f, new String[] { "my" }),
+		// Use DroidSansFallback for Chinese, Japanese and Korean
+		new BundledFont("DroidSansFallback.ttf", 12f, new String[] { "zh" , "ja", "ko" }),
 	};
 
 	// Map from languages to fonts
diff --git a/i18n/DroidSansFallback.ttf b/i18n/DroidSansFallback.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..61460b1f9df674885ff4048253a37ef68e986bae
Binary files /dev/null and b/i18n/DroidSansFallback.ttf differ