diff --git a/src/gui_w32.c b/src/gui_w32.c
index bcc1524..aad613c 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -987,6 +987,11 @@
 			{
 			    LPNMTTDISPINFOW	lpdi = (LPNMTTDISPINFOW)lParam;
 
+			    /* Set the maximum width, this also enables using
+			     * \n for line break. */
+			    SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
+								      0, 500);
+
 			    tt_text = enc_to_ucs2(str, NULL);
 			    lpdi->lpszText = tt_text;
 			    /* can't show tooltip if failed */
@@ -996,6 +1001,11 @@
 			{
 			    LPNMTTDISPINFO	lpdi = (LPNMTTDISPINFO)lParam;
 
+			    /* Set the maximum width, this also enables using
+			     * \n for line break. */
+			    SendMessage(lpdi->hdr.hwndFrom, TTM_SETMAXTIPWIDTH,
+								      0, 500);
+
 			    if (STRLEN(str) < sizeof(lpdi->szText)
 				    || ((tt_text = vim_strsave(str)) == NULL))
 				vim_strncpy(lpdi->szText, str,
@@ -4734,12 +4744,12 @@
 	    cur_beval->showState = ShS_NEUTRAL;
 	    break;
 	case TTN_GETDISPINFO:
-	{
-	    /* if you get there then we have new common controls */
-	    NMTTDISPINFO_NEW *info = (NMTTDISPINFO_NEW *)pnmh;
-	    info->lpszText = (LPSTR)info->lParam;
-	    info->uFlags |= TTF_DI_SETITEM;
-	}
+	    {
+		/* if you get there then we have new common controls */
+		NMTTDISPINFO_NEW *info = (NMTTDISPINFO_NEW *)pnmh;
+		info->lpszText = (LPSTR)info->lParam;
+		info->uFlags |= TTF_DI_SETITEM;
+	    }
 	    break;
 	}
     }
diff --git a/src/version.c b/src/version.c
index d60f52d..5846a40 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    196,
+/**/
     195,
 /**/
     194,