diff --git a/net-p2p/twister/Makefile b/net-p2p/twister/Makefile
index b09bb75488a4..243310a3fc5c 100644
--- a/net-p2p/twister/Makefile
+++ b/net-p2p/twister/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	twister-core
-PORTVERSION=	0.9.30
+PORTVERSION=	0.9.31
 DISTVERSIONPREFIX=	v
 PORTEPOCH=	1
 CATEGORIES=	net-p2p
diff --git a/net-p2p/twister/distinfo b/net-p2p/twister/distinfo
index 887b1824753a..0dd61615564b 100644
--- a/net-p2p/twister/distinfo
+++ b/net-p2p/twister/distinfo
@@ -1,2 +1,2 @@
-SHA256 (miguelfreitas-twister-core-v0.9.30_GH0.tar.gz) = f37b7f5dc359629dfe69b11770c180be66829e39b3c49d0c82b9886f308e69c4
-SIZE (miguelfreitas-twister-core-v0.9.30_GH0.tar.gz) = 6206014
+SHA256 (miguelfreitas-twister-core-v0.9.31_GH0.tar.gz) = ccb85f5eaac46a668908c69063adcc796a2bb4cb69907b1c093dbf8fcf58c101
+SIZE (miguelfreitas-twister-core-v0.9.31_GH0.tar.gz) = 6211128
diff --git a/net-p2p/twister/files/patch-src_twister.cpp b/net-p2p/twister/files/patch-src_twister.cpp
new file mode 100644
index 000000000000..522d64a6a95f
--- /dev/null
+++ b/net-p2p/twister/files/patch-src_twister.cpp
@@ -0,0 +1,26 @@
+--- src/twister.cpp.orig	2015-10-19 01:02:01 UTC
++++ src/twister.cpp
+@@ -1624,7 +1624,7 @@ bool usernameExists(std::string const &u
+ 
+ bool createSignedUserpost(entry &v, std::string const &username, int k,
+                           int flag, std::string const &msg,
+-                          entry const *ent, entry const *sig,
++                          entry const *ent, entry const *sig_rtfav,
+                           std::string const &reply_n = "", int reply_k = 0)
+ {
+     entry &userpost = v["userpost"];
+@@ -1657,12 +1657,12 @@ bool createSignedUserpost(entry &v, std:
+         }
+         //userpost["t"] = "rt";
+         userpost["rt"] = *ent;
+-        userpost["sig_rt"] = *sig;
++        userpost["sig_rt"] = *sig_rtfav;
+         break;
+     }
+     case USERPOST_FLAG_FAV:
+         userpost["fav"] = *ent;
+-        userpost["sig_fav"] = *sig;
++        userpost["sig_fav"] = *sig_rtfav;
+         break;
+     case USERPOST_FLAG_DM:
+         //userpost["t"] = "dm";