diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index ec5440e37a78..038fc8675224 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	weechat
-PORTVERSION=	0.3.6
+PORTVERSION=	0.3.7
 CATEGORIES=	irc
 MASTER_SITES=	http://weechat.org/files/src/
 
@@ -20,11 +20,12 @@ CONFLICTS=	weechat-devel-0.*
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
-WITH_NCURSES_BASE=	yes
 USE_CMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 WANT_PERL=	yes
 
+LIB_DEPENDS+=	curl.6:${PORTSDIR}/ftp/curl
+
 OPTIONS=	RUBY		"Ruby scripting support"	Off	\
 		PYTHON		"Python scripting support"	Off	\
 		PERL		"Perl scripting support"	Off	\
@@ -122,7 +123,7 @@ PLIST_SUB+=	LUA="@comment "
 
 .if defined(WITH_DOCUMENTATION)
 BUILD_DEPENDS+=	asciidoc:${PORTSDIR}/textproc/asciidoc
-BUILD_DEPENDS+=	source-highlight:${PORTSDIR}/textproc/source-highlight
+BUILD_DEPENDS+=	source-highlight>=3.1.5:${PORTSDIR}/textproc/source-highlight
 PLIST_SUB+=	DOCUMENTATION=""
 .else
 CMAKE_ARGS+=	-DENABLE_DOC=no
@@ -146,6 +147,6 @@ post-patch:
 .endif
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/weechat-curses.1 ${MAN1PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/irc/weechat/distinfo b/irc/weechat/distinfo
index 8e3ffdfb37a0..0a9f51028738 100644
--- a/irc/weechat/distinfo
+++ b/irc/weechat/distinfo
@@ -1,2 +1,2 @@
-SHA256 (weechat-0.3.6.tar.gz) = ee3401e31d38e37bd03468655de03f78e60deaf7e71f317d5fc0fba1a8020581
-SIZE (weechat-0.3.6.tar.gz) = 3101349
+SHA256 (weechat-0.3.7.tar.gz) = d4cede0aeb8e3709cc0f2c3af788381d23c365a4e40b428b7a39da5c3af4f0ae
+SIZE (weechat-0.3.7.tar.gz) = 3458650
diff --git a/irc/weechat/files/patch-cmake-FindPython_cmake b/irc/weechat/files/patch-cmake-FindPython_cmake
deleted file mode 100644
index bf80f23b1fe0..000000000000
--- a/irc/weechat/files/patch-cmake-FindPython_cmake
+++ /dev/null
@@ -1,21 +0,0 @@
---- cmake/FindPython.cmake.orig	2010-12-20 18:43:34.102131358 +0000
-+++ cmake/FindPython.cmake	2010-12-20 19:16:11.918184057 +0000
-@@ -34,8 +34,7 @@
- ENDIF(PYTHON_FOUND)
- 
- FIND_PROGRAM(PYTHON_EXECUTABLE
--  NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
--  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
-+  NAMES ${BSD_PYTHON_CMD}
-   )
- 
- IF(PYTHON_EXECUTABLE)
-@@ -65,7 +64,7 @@
-     )
-   
-   FIND_LIBRARY(PYTHON_LIBRARY
--    NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2
-+    NAMES ${BSD_PYTHON_VER}
-     PATHS ${PYTHON_POSSIBLE_LIB_PATH}
-     )
- 
diff --git a/irc/weechat/files/patch-cmake-FindRuby_cmake b/irc/weechat/files/patch-cmake-FindRuby_cmake
index 05a378acb002..46ea01f4c0c3 100644
--- a/irc/weechat/files/patch-cmake-FindRuby_cmake
+++ b/irc/weechat/files/patch-cmake-FindRuby_cmake
@@ -1,5 +1,5 @@
---- cmake/FindRuby.cmake.orig	2011-01-18 19:54:43.825973597 +0000
-+++ cmake/FindRuby.cmake	2011-01-18 19:57:33.943672013 +0000
+--- cmake/FindRuby.cmake.orig	2011-11-21 17:12:47.000000000 +0000
++++ cmake/FindRuby.cmake	2011-11-22 21:04:12.114830585 +0000
 @@ -32,13 +32,12 @@
  ENDIF(RUBY_FOUND)
  
@@ -11,8 +11,8 @@
  
  IF(RUBY_EXECUTABLE)
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['archdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubyhdrdir'] || Config::CONFIG['topdir']"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
++    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['topdir']"
      OUTPUT_VARIABLE RUBY_ARCH_DIR
      )
  
@@ -20,14 +20,14 @@
      )
  
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['libdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::TOPDIR + '/lib'"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['libdir']"
++    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib'"
      OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
      )
-   
+ 
    EXECUTE_PROCESS(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::CONFIG['rubylibdir']"
-+    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts Config::TOPDIR + '/lib/ruby/' + Config::CONFIG['ruby_version']"
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['rubylibdir']"
++    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::TOPDIR + '/lib/ruby/' + RbConfig::CONFIG['ruby_version']"
      OUTPUT_VARIABLE RUBY_RUBY_LIB_PATH
      )
  
diff --git a/irc/weechat/pkg-plist b/irc/weechat/pkg-plist
index d6abd04950f0..d0f10b90aaa1 100644
--- a/irc/weechat/pkg-plist
+++ b/irc/weechat/pkg-plist
@@ -15,6 +15,7 @@ libdata/pkgconfig/weechat.pc
 %%PYTHON%%lib/weechat/plugins/python.so
 %%RUBY%%lib/weechat/plugins/ruby.so
 %%TCL%%lib/weechat/plugins/tcl.so
+%%DOCUMENTATION%%share/doc/weechat/weechat_dev.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_faq.fr.html
@@ -25,11 +26,13 @@ libdata/pkgconfig/weechat.pc
 %%DOCUMENTATION%%share/doc/weechat/weechat_plugin_api.it.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.en.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.es.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.fr.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.ja.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.it.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.pl.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_quickstart.ru.html
+%%DOCUMENTATION%%share/doc/weechat/weechat_relay_protocol.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.de.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.en.html
 %%DOCUMENTATION%%share/doc/weechat/weechat_scripting.fr.html
@@ -50,6 +53,7 @@ libdata/pkgconfig/weechat.pc
 %%NLS%%share/locale/fr/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/it/LC_MESSAGES/weechat.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/weechat.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/weechat.mo