diff --git a/A02-expose-clip_id.patch b/A02-expose-clip_id.patch
index ed35844..572d8ed 100644
--- a/A02-expose-clip_id.patch
+++ b/A02-expose-clip_id.patch
@@ -1,37 +1,32 @@
-From 1a113167733091fe325152a5ece4d57ee1b89dc0 Mon Sep 17 00:00:00 2001
 From: John Stebbins <stebbins@jetheaddev.com>
-Date: Wed, 18 May 2016 15:40:17 -0600
-Subject: [PATCH] expose clip_id in BLURAY_CLIP_INFO
+Date: Sat, 14 Jan 2017 18:03:14 +0000 (-0700)
+Subject: expose clip_id in BLURAY_CLIP_INFO
+X-Git-Url: http://git.videolan.org/?p=libbluray.git;a=commitdiff_plain;h=da50ad6ee5ceef6e81a96af0f2affcfe961c9d9f
 
+expose clip_id in BLURAY_CLIP_INFO
 ---
- src/libbluray/bluray.c | 1 +
- src/libbluray/bluray.h | 1 +
- 2 files changed, 2 insertions(+)
 
 diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
-index b7598b9..3478ade 100644
+index fdaadc5..c515019 100644
 --- a/src/libbluray/bluray.c
 +++ b/src/libbluray/bluray.c
-@@ -2602,6 +2602,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx,
-         BLURAY_CLIP_INFO *ci = &title_info->clips[ii];
-         NAV_CLIP *nc = &title->clip_list.clip[ii];
+@@ -2672,6 +2672,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx,
+             BLURAY_CLIP_INFO *ci = &title_info->clips[ii];
+             NAV_CLIP *nc = &title->clip_list.clip[ii];
  
-+        memcpy(ci->clip_id, pi->clip->clip_id, sizeof(ci->clip_id));
-         ci->pkt_count = nc->end_pkt - nc->start_pkt;
-         ci->start_time = (uint64_t)nc->title_time * 2;
-         ci->in_time = (uint64_t)pi->in_time * 2;
++            memcpy(ci->clip_id, pi->clip->clip_id, sizeof(ci->clip_id));
+             ci->pkt_count = nc->end_pkt - nc->start_pkt;
+             ci->start_time = (uint64_t)nc->title_time * 2;
+             ci->in_time = (uint64_t)pi->in_time * 2;
 diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h
-index 3cd7118..177b3d4 100644
+index 997f59d..725292e 100644
 --- a/src/libbluray/bluray.h
 +++ b/src/libbluray/bluray.h
-@@ -225,6 +225,7 @@ typedef struct bd_stream_info {
- } BLURAY_STREAM_INFO;
- 
- typedef struct bd_clip {
+@@ -244,6 +244,7 @@ typedef struct bd_clip {
+     uint64_t           start_time;  /* start media time, 90kHz, ("playlist time") */
+     uint64_t           in_time;     /* start timestamp, 90kHz */
+     uint64_t           out_time;    /* end timestamp, 90kHz */
 +    char               clip_id[6];
-     uint32_t           pkt_count;
-     uint8_t            still_mode;
-     uint16_t           still_time;  /* seconds */
--- 
-2.5.5
-
+ } BLURAY_CLIP_INFO;
+ 
+ typedef struct bd_chapter {
diff --git a/libbluray.spec b/libbluray.spec
index 8bcdc5a..69dc5d5 100644
--- a/libbluray.spec
+++ b/libbluray.spec
@@ -26,7 +26,8 @@ License:        LGPL-2.1+
 Group:          Productivity/Multimedia/Other
 Url:            http://www.videolan.org/developers/libbluray.html
 Source0:        http://download.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}.tar.bz2
-Patch1:         https://raw.githubusercontent.com/HandBrake/HandBrake/master/contrib/libbluray/A02-expose-clip_id.patch
+# Taken from upstream
+Patch1:         A02-expose-clip_id.patch
 Source99:       baselibs.conf
 Patch2:         libbluray-jvm_dir.patch
 BuildRequires:  ant