diff --git a/ChangeLog b/ChangeLog
index b04cb5697..819e4e281 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,14 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-04-28
+ChangeLog - 2005-04-30
 
 
 Version 0.1.2 (under dev!):
    * added transfer rate for DCC files
    * added "-all" option for /nick command
    * buffers timestamp can now be changed (new option in config file)
+   * WeeChat now ok under *BSD and Mac OS X
    * fixed crash when purging old DCC
    * fixed crash with 64-bits arch (like AMD64) when converting UTF-8
    * added missing IRC commands (307, 341, 485, 671)
diff --git a/TODO b/TODO
index aaae35cba..b410ee12a 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-TODO - 2005-04-03
+TODO - 2005-04-30
 
 Legend:
   #  done
@@ -16,7 +16,8 @@ v0.1.2:
  * General:
     + Windows version
     + Solaris version
-    + *BSD version
+    # *BSD version
+    # Mac OS X version
 
  * IRC protocol:
     - customizable CTCP version reply
@@ -31,6 +32,9 @@ v0.1.2:
  * Configuration:
     - add key bindings to config file
 
+ * Plugins:
+    + Python plugin
+
 
 Future versions:
 ---------------
@@ -68,7 +72,6 @@ Future versions:
     - IPv6 protocol implementation
 
  * Plugins:
-    - Python plugin
     - "/python load" and "/python unload" commands to (un)load Python scripts
     - Ruby plugin
     - "/ruby load" and "/ruby unload" commands to (un)load Ruby scripts
diff --git a/configure.in b/configure.in
index ff7c9b288..5c4192447 100644
--- a/configure.in
+++ b/configure.in
@@ -47,10 +47,24 @@ AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h s
 AC_HEADER_TIME
 AC_STRUCT_TM
 
+AC_MSG_CHECKING([for socklen_t])
+AC_CACHE_VAL(ac_cv_type_socklen_t,
+[AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>],
+[socklen_t t;],
+ac_cv_type_socklen_t=yes,
+ac_cv_type_socklen_t=no,
+)])
+if test $ac_cv_type_socklen_t = no; then
+AC_DEFINE(socklen_t, int, Define to 'int' if <sys/socket.h> doesn't define.)
+fi
+AC_MSG_RESULT($ac_cv_type_socklen_t)
+
 # Checks for library functions.
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strncasecmp strpbrk strrchr strstr uname])
+AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strncasecmp strpbrk strrchr strstr uname])
 
 AH_VERBATIM([PLUGINS], [#undef PLUGINS])
 AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
diff --git a/src/common/weechat.c b/src/common/weechat.c
index 41ab68191..66d5fea4d 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -52,7 +52,9 @@
 #include <iconv.h>
 #endif
 
+#ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
+#endif
 
 #include "weechat.h"
 #include "weeconfig.h"
@@ -739,7 +741,9 @@ main (int argc, char *argv[])
     textdomain (PACKAGE);
     #endif
     
+    #ifdef HAVE_LANGINFO_CODESET
     local_charset = strdup (nl_langinfo (CODESET));
+    #endif
     
     signal (SIGINT, my_sigint);     /* ignore SIGINT signal                 */
     signal (SIGSEGV, my_sigsegv);   /* crash dump when SIGSEGV is received  */
diff --git a/src/common/weechat.h b/src/common/weechat.h
index 24520765e..6b40fe965 100644
--- a/src/common/weechat.h
+++ b/src/common/weechat.h
@@ -30,7 +30,11 @@
 
 #if defined(ENABLE_NLS) && !defined(_)
     #include <locale.h>
-    #include <libintl.h>
+    #ifdef HAVE_LIBINTL_H
+        #include <libintl.h>
+    #else
+        #include "../../intl/libintl.h"
+    #endif
     #define _(x) gettext(x)
     #ifdef gettext_noop
         #define N_(string) gettext_noop (string)
diff --git a/weechat/ChangeLog b/weechat/ChangeLog
index b04cb5697..819e4e281 100644
--- a/weechat/ChangeLog
+++ b/weechat/ChangeLog
@@ -1,13 +1,14 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-ChangeLog - 2005-04-28
+ChangeLog - 2005-04-30
 
 
 Version 0.1.2 (under dev!):
    * added transfer rate for DCC files
    * added "-all" option for /nick command
    * buffers timestamp can now be changed (new option in config file)
+   * WeeChat now ok under *BSD and Mac OS X
    * fixed crash when purging old DCC
    * fixed crash with 64-bits arch (like AMD64) when converting UTF-8
    * added missing IRC commands (307, 341, 485, 671)
diff --git a/weechat/TODO b/weechat/TODO
index aaae35cba..b410ee12a 100644
--- a/weechat/TODO
+++ b/weechat/TODO
@@ -1,7 +1,7 @@
 WeeChat - Wee Enhanced Environment for Chat
 ===========================================
 
-TODO - 2005-04-03
+TODO - 2005-04-30
 
 Legend:
   #  done
@@ -16,7 +16,8 @@ v0.1.2:
  * General:
     + Windows version
     + Solaris version
-    + *BSD version
+    # *BSD version
+    # Mac OS X version
 
  * IRC protocol:
     - customizable CTCP version reply
@@ -31,6 +32,9 @@ v0.1.2:
  * Configuration:
     - add key bindings to config file
 
+ * Plugins:
+    + Python plugin
+
 
 Future versions:
 ---------------
@@ -68,7 +72,6 @@ Future versions:
     - IPv6 protocol implementation
 
  * Plugins:
-    - Python plugin
     - "/python load" and "/python unload" commands to (un)load Python scripts
     - Ruby plugin
     - "/ruby load" and "/ruby unload" commands to (un)load Ruby scripts
diff --git a/weechat/configure.in b/weechat/configure.in
index ff7c9b288..5c4192447 100644
--- a/weechat/configure.in
+++ b/weechat/configure.in
@@ -47,10 +47,24 @@ AC_CHECK_HEADERS([arpa/inet.h libintl.h limits.h locale.h netdb.h netinet/in.h s
 AC_HEADER_TIME
 AC_STRUCT_TM
 
+AC_MSG_CHECKING([for socklen_t])
+AC_CACHE_VAL(ac_cv_type_socklen_t,
+[AC_TRY_COMPILE([
+#include <sys/types.h>
+#include <sys/socket.h>],
+[socklen_t t;],
+ac_cv_type_socklen_t=yes,
+ac_cv_type_socklen_t=no,
+)])
+if test $ac_cv_type_socklen_t = no; then
+AC_DEFINE(socklen_t, int, Define to 'int' if <sys/socket.h> doesn't define.)
+fi
+AC_MSG_RESULT($ac_cv_type_socklen_t)
+
 # Checks for library functions.
 AC_FUNC_SELECT_ARGTYPES
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strncasecmp strpbrk strrchr strstr uname])
+AC_CHECK_FUNCS([gethostbyname gethostname getsockname gettimeofday inet_ntoa memset mkdir select setlocale socket strcasecmp strchr strdup strncasecmp strpbrk strrchr strstr uname])
 
 AH_VERBATIM([PLUGINS], [#undef PLUGINS])
 AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL])
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index 41ab68191..66d5fea4d 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -52,7 +52,9 @@
 #include <iconv.h>
 #endif
 
+#ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
+#endif
 
 #include "weechat.h"
 #include "weeconfig.h"
@@ -739,7 +741,9 @@ main (int argc, char *argv[])
     textdomain (PACKAGE);
     #endif
     
+    #ifdef HAVE_LANGINFO_CODESET
     local_charset = strdup (nl_langinfo (CODESET));
+    #endif
     
     signal (SIGINT, my_sigint);     /* ignore SIGINT signal                 */
     signal (SIGSEGV, my_sigsegv);   /* crash dump when SIGSEGV is received  */
diff --git a/weechat/src/common/weechat.h b/weechat/src/common/weechat.h
index 24520765e..6b40fe965 100644
--- a/weechat/src/common/weechat.h
+++ b/weechat/src/common/weechat.h
@@ -30,7 +30,11 @@
 
 #if defined(ENABLE_NLS) && !defined(_)
     #include <locale.h>
-    #include <libintl.h>
+    #ifdef HAVE_LIBINTL_H
+        #include <libintl.h>
+    #else
+        #include "../../intl/libintl.h"
+    #endif
     #define _(x) gettext(x)
     #ifdef gettext_noop
         #define N_(string) gettext_noop (string)