diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index 3fa977f07a1..d44415589a7 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2015/09/03 17:44:13 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2015/10/05 08:46:21 dcoppa Exp $
 
 COMMENT-main=	fast, light and extensible chat client
 COMMENT-lua=	Lua bindings for weechat
@@ -82,7 +82,7 @@ CONFIGURE_ARGS+=-DENABLE_ASPELL=no \
 		-DMODTCL_LIB=${MODTCL_LIB}
 
 pre-configure:
-	rm ${WRKSRC}/cmake/FindLua.cmake \
+	rm -f ${WRKSRC}/cmake/FindLua.cmake \
 		${WRKSRC}/cmake/FindRuby.cmake \
 		${WRKSRC}/cmake/FindTCL.cmake
 
diff --git a/net/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/net/weechat/patches/patch-src_gui_curses_CMakeLists_txt
new file mode 100644
index 00000000000..01287f16d05
--- /dev/null
+++ b/net/weechat/patches/patch-src_gui_curses_CMakeLists_txt
@@ -0,0 +1,25 @@
+$OpenBSD: patch-src_gui_curses_CMakeLists_txt,v 1.4 2015/10/05 08:46:21 dcoppa Exp $
+
+Fix cyclical dependency error
+
+--- src/gui/curses/CMakeLists.txt.orig	Sun Aug 16 08:27:07 2015
++++ src/gui/curses/CMakeLists.txt	Sun Oct  4 11:26:54 2015
+@@ -88,17 +88,13 @@ target_link_libraries(${EXECUTABLE} ${STATIC_LIBS} wee
+ # This link is created for compatibility with old versions on /upgrade.
+ # It may be removed in future.
+ add_custom_command(
+-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
++  TARGET ${EXECUTABLE} POST_BUILD
+   COMMAND ${CMAKE_COMMAND} -E remove -f "weechat-curses${CMAKE_EXECUTABLE_SUFFIX}"
+   COMMAND ${CMAKE_COMMAND} -E create_symlink "weechat${CMAKE_EXECUTABLE_SUFFIX}" "weechat-curses${CMAKE_EXECUTABLE_SUFFIX}"
+   DEPENDS ${EXECUTABLE}
+   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+   COMMENT "Creating symbolic link ${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}"
+-  )
+-add_custom_target(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ALL
+-  DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX}
+ )
+-add_dependencies(${EXECUTABLE}-curses${CMAKE_EXECUTABLE_SUFFIX} ${EXECUTABLE})
+ list(APPEND CMAKE_INSTALL_MANIFEST_FILES "${CMAKE_INSTALL_PREFIX}/bin/weechat-curses${CMAKE_EXECUTABLE_SUFFIX}")
+ 
+ # Install executable and symbolic link