diff --git a/debian/patches/support-kfreebsd.patch b/debian/patches/support-kfreebsd.patch
index 12d16c6..42b636f 100644
--- a/debian/patches/support-kfreebsd.patch
+++ b/debian/patches/support-kfreebsd.patch
@@ -899,3 +899,68 @@
            'dependencies': [
              'testing',
            ],
+diff --git a/languages/japanese/lang_dep_spec.cc b/languages/japanese/lang_dep_spec.cc
+index 675a8f5..fd4a4dc 100755
+--- a/languages/japanese/lang_dep_spec.cc
++++ b/languages/japanese/lang_dep_spec.cc
+@@ -48,7 +48,7 @@ string LangDepSpecJapanese::GetServerExecName() const {
+ #endif  // GOOGLE_JAPANESE_INPUT_BUILD
+ #elif OS_MACOSX
+   return kProductPrefix "Converter.app";
+-#elif OS_LINUX
++#elif defined(OS_LINUX) || defined(OS_GNU_KFREEBSD) 
+   return "mozc_server";
+ #else
+ #error "Unsupported platform. Windows, Mac OS X, and GNU/Linux are supported."
+diff --git a/chrome/skk/skk.gyp b/chrome/skk/skk.gyp
+index ac6817a..f914e67 100755
+--- a/chrome/skk/skk.gyp
++++ b/chrome/skk/skk.gyp
+@@ -42,7 +42,7 @@
+     'configuration_nacl_i686': '<(CONFIGURATION_NAME)_NaCl_i686',
+     'configuration_nacl_x86_64': '<(CONFIGURATION_NAME)_NaCl_x86-64',
+     'conditions': [
+-      ['OS=="linux"', {
++      ['OS=="linux" or OS=="gnu-kfreebsd"', {
+         # We need to copy binaries for NaCl i686 and x86-64 into a single skk
+         # directory across configurations.  The following variables must be
+         # the same as <(PRODUCT_DIR) for each configuration.
+diff --git a/handwriting/handwriting.gyp b/handwriting/handwriting.gyp
+index 062f018..425c6d4 100755
+--- a/handwriting/handwriting.gyp
++++ b/handwriting/handwriting.gyp
+@@ -39,7 +39,7 @@
+         '../base/base.gyp:base',
+         '../gui/zinnia.gyp:zinnia',
+       ],
+-      'conditions': [['use_libzinnia==1 and OS=="linux"', {
++      'conditions': [['use_libzinnia==1 and (OS=="linux" or OS=="gnu-kfreebsd")', {
+         'defines': [
+           'USE_LIBZINNIA',
+         ],
+diff --git a/languages/chewing/chewing.gyp b/languages/chewing/chewing.gyp
+index 353f240..c7e5ef0 100755
+--- a/languages/chewing/chewing.gyp
++++ b/languages/chewing/chewing.gyp
+@@ -61,7 +61,7 @@
+     }
+   ],
+   'conditions': [
+-    ['OS=="linux"', {
++    ['OS=="linux" or OS=="gnu-kfreebsd"', {
+       'targets': [
+         {
+           'target_name': 'ibus_mozc_chewing_metadata',
+diff --git a/languages/hangul/hangul.gyp b/languages/hangul/hangul.gyp
+index 452bde8..72a049f 100755
+--- a/languages/hangul/hangul.gyp
++++ b/languages/hangul/hangul.gyp
+@@ -59,7 +59,7 @@
+     },
+   ],
+   'conditions': [
+-    ['OS=="linux"', {
++    ['OS=="linux" or OS=="gnu-kfreebsd"', {
+       'targets': [
+         {
+           'target_name': 'ibus_mozc_hangul_metadata',