diff --git a/multimedia/video/mpv-player/pspec.xml b/multimedia/video/mpv-player/pspec.xml
index 1f28012ef2..3ad98de510 100644
--- a/multimedia/video/mpv-player/pspec.xml
+++ b/multimedia/video/mpv-player/pspec.xml
@@ -12,7 +12,7 @@
         <IsA>app:gui</IsA>
         <Summary>mpv is based on mplayer2</Summary>
         <Description>mpv  has Wayland support, Improved OpenGL output,  Support for libavfilter (for video->video and audio->audio). This allows using most of FFmpeg's filters, which improve greatly on the old MPlayer filters in features, performance, and correctness.is a movie player that can run on many platforms. Improved OpenGL output. More correct color reproduction (color matrix generation), including support for BT.2020 (Ultra HD) and linear XYZ (Digital Cinema) inputs.</Description>        
-        <Archive sha1sum="9cf153b9f398d231ae625a857bfe685a92ad9b9c" type="targz">https://github.com/mpv-player/mpv/archive/v0.16.0.tar.gz</Archive>
+        <Archive sha1sum="d1423746132ee2e879b59af2667c7678549f6778" type="targz">https://github.com/mpv-player/mpv/archive/v0.17.0.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>ffmpeg-devel</Dependency>
             <Dependency>mesa-devel</Dependency>
@@ -112,6 +112,13 @@
         </RuntimeDependencies>
     </Package>
     <History>
+        <Update release="4">
+            <Date>2016-06-09</Date>
+            <Version>0.17.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2016-06-09</Date>
             <Version>0.16.0</Version>
diff --git a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
index 22354937a3..1f6806906c 100644
--- a/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
+++ b/multimedia/video/xine-lib/files/xine-lib-ffmpeg3.patch
@@ -52,4 +52,8 @@ Index: xine-lib-1.2.6/src/combined/ffmpeg/ff_video_decoder.c
 +  this->picture = av_frame_alloc();
    if (!this->picture) {
      xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
-       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
\ No newline at end of file
+<<<<<<< HEAD
+       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
+=======
+       "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");
+>>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129
diff --git a/multimedia/video/xine-lib/pspec.xml b/multimedia/video/xine-lib/pspec.xml
index e4a126a7db..93e4878ac9 100644
--- a/multimedia/video/xine-lib/pspec.xml
+++ b/multimedia/video/xine-lib/pspec.xml
@@ -65,6 +65,7 @@
             <Patch level="1">tr_segfault_fix.patch</Patch>
             <Patch level="1">deepbind.patch</Patch>
             <Patch level="1">lpthread.patch</Patch>
+            <Patch level="1">xine-lib-ffmpeg3.patch</Patch>
         </Patches>
     </Source>
 
@@ -137,7 +138,11 @@
 
     <History>
         <Update release="2">
+<<<<<<< HEAD
             <Date>2016-06-14</Date>
+=======
+            <Date>2016-06-13</Date>
+>>>>>>> a702ec9aec8c201fc9985eed2bed7e5b675a5129
             <Version>1.2.6</Version>
             <Comment>Release Bump.</Comment>
             <Name>Pisi Linux Community</Name>