diff --git a/ChangeLog b/ChangeLog
index f8c1a156..11bd7337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-08  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
+
+	Fixed compilation error with --disable-nls
+	It seems that defining gettext(Msgid) to ((const char *) (Msgid))
+	in gettext.h causes the problem.
+	* src/common.h
+
 2008-03-07  Tatsuhiro Tsujikawa  <tujikawa at rednoah dot com>
 
 	Removed subPiece related functions.
diff --git a/src/common.h b/src/common.h
index 56a7346c..cce54d9e 100644
--- a/src/common.h
+++ b/src/common.h
@@ -52,8 +52,12 @@
 #endif
 #endif // __MINGW32__
 
-#include "gettext.h"
-#define _(String) gettext(String)
+#ifdef ENABLE_NLS
+# include "gettext.h"
+# define _(String) gettext(String)
+#else // ENABLE_NLS
+# define _(String) String
+#endif
 
 // use C99 limit macros
 #define __STDC_LIMIT_MACROS