diff --git a/cmd/example/main.go b/cmd/example/main.go
index b73ba29564..d3a85ad995 100644
--- a/cmd/example/main.go
+++ b/cmd/example/main.go
@@ -17,12 +17,12 @@ import (
 
 	"github.com/livepeer/lpms/transcoder"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/golang/glog"
 	"github.com/livepeer/lpms/core"
 	"github.com/livepeer/lpms/ffmpeg"
 	"github.com/livepeer/lpms/segmenter"
 	"github.com/livepeer/lpms/stream"
+	"github.com/livepeer/m3u8"
 )
 
 var HLSWaitTime = time.Second * 10
diff --git a/core/lpms.go b/core/lpms.go
index e1876c2bc7..8ff3b01a54 100644
--- a/core/lpms.go
+++ b/core/lpms.go
@@ -10,13 +10,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/golang/glog"
 	"github.com/livepeer/lpms/ffmpeg"
 	"github.com/livepeer/lpms/segmenter"
 	"github.com/livepeer/lpms/stream"
 	"github.com/livepeer/lpms/vidlistener"
 	"github.com/livepeer/lpms/vidplayer"
+	"github.com/livepeer/m3u8"
 
 	joy4rtmp "github.com/nareix/joy4/format/rtmp"
 )
diff --git a/ffmpeg/videoprofile.go b/ffmpeg/videoprofile.go
index a7d67219c3..b3946dd86b 100644
--- a/ffmpeg/videoprofile.go
+++ b/ffmpeg/videoprofile.go
@@ -4,8 +4,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/golang/glog"
+	"github.com/livepeer/m3u8"
 )
 
 //Standard Profiles:
diff --git a/segmenter/video_segmenter.go b/segmenter/video_segmenter.go
index c59754e2d3..7b9854fd1d 100644
--- a/segmenter/video_segmenter.go
+++ b/segmenter/video_segmenter.go
@@ -13,10 +13,10 @@ import (
 
 	"path"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/golang/glog"
 	"github.com/livepeer/lpms/ffmpeg"
 	"github.com/livepeer/lpms/stream"
+	"github.com/livepeer/m3u8"
 	"github.com/nareix/joy4/av"
 )
 
diff --git a/segmenter/video_segmenter_test.go b/segmenter/video_segmenter_test.go
index 14ab09c021..83392fa2ad 100644
--- a/segmenter/video_segmenter_test.go
+++ b/segmenter/video_segmenter_test.go
@@ -19,11 +19,11 @@ import (
 
 	"strings"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/golang/glog"
 	"github.com/livepeer/lpms/ffmpeg"
 	"github.com/livepeer/lpms/stream"
 	"github.com/livepeer/lpms/vidplayer"
+	"github.com/livepeer/m3u8"
 	"github.com/nareix/joy4/av"
 	"github.com/nareix/joy4/av/avutil"
 	"github.com/nareix/joy4/format"
diff --git a/stream/basic_hls_video_manifest.go b/stream/basic_hls_video_manifest.go
index 885611301d..41e42fd2c8 100644
--- a/stream/basic_hls_video_manifest.go
+++ b/stream/basic_hls_video_manifest.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/golang/glog"
+	"github.com/livepeer/m3u8"
 )
 
 var ErrVideoManifest = errors.New("ErrVideoManifest")
diff --git a/stream/basic_hls_video_test.go b/stream/basic_hls_video_test.go
index fd9bc3a22c..2612997bdf 100644
--- a/stream/basic_hls_video_test.go
+++ b/stream/basic_hls_video_test.go
@@ -3,7 +3,7 @@ package stream
 import (
 	"testing"
 
-	"github.com/ericxtang/m3u8"
+	"github.com/livepeer/m3u8"
 )
 
 func TestAddAndRemove(t *testing.T) {
diff --git a/stream/basic_hls_videostream.go b/stream/basic_hls_videostream.go
index 547425ed93..d12a5869f2 100644
--- a/stream/basic_hls_videostream.go
+++ b/stream/basic_hls_videostream.go
@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ericxtang/m3u8"
+	"github.com/livepeer/m3u8"
 )
 
 const DefaultHLSStreamCap = uint(500)
diff --git a/stream/hls.go b/stream/hls.go
index 422e856df5..55c91f68b4 100644
--- a/stream/hls.go
+++ b/stream/hls.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/ericxtang/m3u8"
+	"github.com/livepeer/m3u8"
 )
 
 var ErrNotFound = errors.New("Not Found")
diff --git a/stream/interface.go b/stream/interface.go
index fae976654f..2ba5e36258 100644
--- a/stream/interface.go
+++ b/stream/interface.go
@@ -3,7 +3,7 @@ package stream
 import (
 	"context"
 
-	"github.com/ericxtang/m3u8"
+	"github.com/livepeer/m3u8"
 	"github.com/nareix/joy4/av"
 )
 
diff --git a/stream/stream.go b/stream/stream.go
index 6d35126e55..141135cdfe 100644
--- a/stream/stream.go
+++ b/stream/stream.go
@@ -7,7 +7,7 @@ import (
 
 	"time"
 
-	"github.com/ericxtang/m3u8"
+	"github.com/livepeer/m3u8"
 )
 
 var ErrBufferFull = errors.New("Stream Buffer Full")
diff --git a/vidplayer/player.go b/vidplayer/player.go
index e0144035c5..8070389733 100644
--- a/vidplayer/player.go
+++ b/vidplayer/player.go
@@ -16,9 +16,9 @@ import (
 
 	"time"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/golang/glog"
 	"github.com/livepeer/lpms/stream"
+	"github.com/livepeer/m3u8"
 	joy4rtmp "github.com/nareix/joy4/format/rtmp"
 )
 
diff --git a/vidplayer/player_test.go b/vidplayer/player_test.go
index 164306b65a..72bd2f1a40 100644
--- a/vidplayer/player_test.go
+++ b/vidplayer/player_test.go
@@ -10,8 +10,8 @@ import (
 
 	"net/url"
 
-	"github.com/ericxtang/m3u8"
 	"github.com/livepeer/lpms/stream"
+	"github.com/livepeer/m3u8"
 	joy4rtmp "github.com/nareix/joy4/format/rtmp"
 )