diff --git a/libr/anal/p/anal_x86_cs.c b/libr/anal/p/anal_x86_cs.c
index 9f29cb1f92..308fa243e4 100644
--- a/libr/anal/p/anal_x86_cs.c
+++ b/libr/anal/p/anal_x86_cs.c
@@ -294,7 +294,7 @@ static void anop_esil (RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len
 	case X86_INS_FXCH:
 		break;
 	case X86_INS_FTST:
-	//case X86_INS_FUCOMPI:
+	case X86_INS_FUCOMPI:
 	case X86_INS_FUCOMI:
 	case X86_INS_FUCOMPP:
 	case X86_INS_FUCOMP:
@@ -1514,7 +1514,7 @@ static void anop(RAnal *a, RAnalOp *op, ut64 addr, const ut8 *buf, int len, csh
 		op->type = R_ANAL_OP_TYPE_STORE;
 		break;
 	case X86_INS_FTST:
-	//case X86_INS_FUCOMPI:
+	case X86_INS_FUCOMPI:
 	case X86_INS_FUCOMI:
 	case X86_INS_FUCOMPP:
 	case X86_INS_FUCOMP:
diff --git a/shlr/Makefile b/shlr/Makefile
index 3272577df8..d3bdab190e 100644
--- a/shlr/Makefile
+++ b/shlr/Makefile
@@ -20,9 +20,9 @@ CS_PATCHES=0
 else
 CS_TAR=
 CS_URL=$(GIT_PREFIX)github.com/aquynh/capstone.git
-CS_UPD=20160912
+CS_UPD=20160828
 CS_BRA=next
-CS_TIP=03ff67a0e0e80cf5f4d923113cbf79da392f598d
+CS_TIP=87a25bb543c8e4c09b48d4b4a6c7db31ce58df06
 # REVERT THIS COMMIT BECAUSE ITS WRONG
 CS_REV=
 CS_PATCHES=1