diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 56b1765bf90..697fc9da752 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.47 2019/12/24 15:05:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2019/12/28 10:08:17 ajacoutot Exp $
 
 COMMENT=	multimedia player
 
 DISTNAME=	xine-ui-0.99.12
+REVISION=	0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=xine/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_network_c b/multimedia/xine-ui/patches/patch-src_xitk_network_c
new file mode 100644
index 00000000000..dcf193a6878
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-src_xitk_network_c
@@ -0,0 +1,27 @@
+$OpenBSD: patch-src_xitk_network_c,v 1.1 2019/12/28 10:08:17 ajacoutot Exp $
+
+Fix some crashes.
+
+Eg, when starting a playlist while already playing something else.
+
+Index: src/xitk/network.c
+--- src/xitk/network.c.orig
++++ src/xitk/network.c
+@@ -2016,7 +2016,7 @@ static void do_playlist(const commands_t *cmd, client_
+ 	  if(j >= 0) {
+ 
+ 	    if((gui->playlist.cur == j) && ((xine_get_status(gui->stream) != XINE_STATUS_STOP)))
+-	      gui_stop(NULL, NULL);
++	      gui_stop(NULL, gui);
+ 	    
+ 	    mediamark_free_entry(j);
+ 	    
+@@ -2044,7 +2044,7 @@ static void do_playlist(const commands_t *cmd, client_
+             enable_playback_controls (gui->panel, 0);
+ 	  
+ 	  if(xine_get_status(gui->stream) != XINE_STATUS_STOP)
+-	    gui_stop(NULL, NULL);
++	    gui_stop(NULL, gui);
+ 	  
+ 	  gui_set_current_mmk(NULL);
+ 	}
diff --git a/multimedia/xine-ui/patches/patch-src_xitk_playlist_c b/multimedia/xine-ui/patches/patch-src_xitk_playlist_c
new file mode 100644
index 00000000000..341cbfb2f69
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-src_xitk_playlist_c
@@ -0,0 +1,45 @@
+$OpenBSD: patch-src_xitk_playlist_c,v 1.1 2019/12/28 10:08:17 ajacoutot Exp $
+
+Fix some crashes.
+
+Eg, when starting a playlist while already playing something else.
+
+Index: src/xitk/playlist.c
+--- src/xitk/playlist.c.orig
++++ src/xitk/playlist.c
+@@ -260,7 +260,7 @@ void playlist_delete_entry(int j) {
+         enable_playback_controls (gui->panel, 0);
+ 
+       if(xine_get_status(gui->stream) != XINE_STATUS_STOP)
+-	gui_stop(NULL, NULL);
++	gui_stop(NULL, gui);
+ 
+       gui_set_current_mmk(NULL);
+       xitk_inputtext_change_text(playlist->winput, NULL);
+@@ -294,7 +294,7 @@ void playlist_delete_all(xitk_widget_t *w, void *data)
+   playlist_update_playlist();
+   
+   if(xine_get_status(gui->stream) != XINE_STATUS_STOP)
+-    gui_stop(NULL, NULL);
++    gui_stop(NULL, gui);
+   
+   if(playlist && playlist->winput)
+     xitk_inputtext_change_text(playlist->winput, NULL);
+@@ -375,7 +375,7 @@ static void _playlist_load_callback(filebrowser_t *fb)
+     playlist_update_playlist();
+ 
+     if((xine_get_status(gui->stream) == XINE_STATUS_PLAY))
+-      gui_stop(NULL, NULL);
++      gui_stop(NULL, gui);
+ 
+     if ((!is_playback_widgets_enabled (gui->panel)) && gui->playlist.num)
+       enable_playback_controls (gui->panel, 1);
+@@ -829,7 +829,7 @@ void playlist_scan_input(xitk_widget_t *w, void *ip) {
+      */
+     if (gui->smart_mode) {
+       if (xine_get_status (gui->stream) == XINE_STATUS_PLAY)
+-        gui_stop (NULL, NULL);
++        gui_stop (NULL, gui);
+       gui_play (NULL, gui);
+     }
+