diff --git a/build_makemkv/Dockerfile b/build_makemkv/Dockerfile
index be90918..5e3ec2d 100644
--- a/build_makemkv/Dockerfile
+++ b/build_makemkv/Dockerfile
@@ -1,22 +1,27 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y python-virtualenv build-essential pkg-config libc6-dev libssl-dev libexpat1-dev libavcodec-dev libgl1-mesa-dev 
+RUN apt-get update && apt-get install -y python-virtualenv build-essential pkg-config libc6-dev libssl-dev libexpat1-dev libavcodec-dev libgl1-mesa-dev curl wget
 
-ADD http://www.makemkv.com/download/makemkv-oss-1.10.2.tar.gz /src/
-ADD http://www.makemkv.com/download/makemkv-bin-1.10.2.tar.gz /src/
+ADD pinger.sh /src/
+RUN chmod +x /src/pinger.sh
+RUN /src/pinger.sh
 
-RUN tar xf /src/makemkv-bin-1.10.2.tar.gz -C /src
+RUN tar xf /src/makemkv-bin.tar.gz -C /src
+RUN mkdir /src/makemkv-bin/
+RUN mv /src/makemkv-bin-*/* /src/makemkv-bin/
 
+RUN mkdir /src/makemkv-bin/tmp/
+RUN echo 'accepted' > /src/makemkv-bin/tmp/eula_accepted
+RUN ls /src/makemkv-bin/
 
-RUN mkdir /src/makemkv-bin-1.10.2/tmp/
-RUN echo 'accepted' > /src/makemkv-bin-1.10.2/tmp/eula_accepted
+RUN  sed -ie 's#DESTDIR=#DESTDIR=/build#g' /src/makemkv-bin/Makefile
 
-RUN  sed -ie 's#DESTDIR=#DESTDIR=/build#g' /src/makemkv-bin-1.10.2/Makefile
+RUN cd /src/makemkv-bin && make install
 
-RUN cd /src/makemkv-bin-1.10.2 && make install
+RUN tar xf /src/makemkv-oss.tar.gz -C /src
+RUN mkdir /src/makemkv-oss/
+RUN mv /src/makemkv-oss-*/* /src/makemkv-oss/
 
-RUN tar xf /src/makemkv-oss-1.10.2.tar.gz -C /src
+RUN cd /src/makemkv-oss && ./configure --prefix /build/usr --disable-gui && make install
 
-RUN cd /src/makemkv-oss-1.10.2 && ./configure --prefix /build/usr --disable-gui && make install
-
-CMD ["tar", "cz", "/build"]
\ No newline at end of file
+CMD ["tar", "cz", "/build"]
diff --git a/build_makemkv/pinger.sh b/build_makemkv/pinger.sh
new file mode 100755
index 0000000..43760e6
--- /dev/null
+++ b/build_makemkv/pinger.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+# Loops through different url combos to find newest makemkv version
+version=""
+keepRunning=true
+echo "-> Finding newest makemkv version..."
+while :
+do
+  for f in $(seq 1 10)
+  do
+    for s in $(seq 12 100) # Starts at 12 bc that was the newest version
+    do
+      for t in $(seq 1 10)
+      do
+        #echo "$f.$s.$t" # Prints every version that's checked
+        if [ $keepRunning == true ]
+        then
+          # Checks to see if url exists
+          curl -s --head http://www.makemkv.com/download/makemkv-oss-$f.$s.$t.tar.gz | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
+        else
+          break
+        fi
+        if [ $? == 0 ]
+        then
+          version="$f.$s.$t"
+          keepRunning=false
+          break
+        fi
+      done
+    done
+  done
+  curl -s --head http://www.makemkv.com/download/makemkv-oss-$version.tar.gz | head -n 1 | grep "HTTP/1.[01] [23].." > /dev/null
+  if [ $? == 0 ] 
+  then
+    break
+  elif [ $? == 1 ]
+  then
+    echo "One"
+  fi
+done
+echo "Version: $version"
+
+# Downloads tar files and removes version number from file name
+wget http://www.makemkv.com/download/makemkv-oss-$version.tar.gz
+mv makemkv-oss-$version.tar.gz /src/makemkv-oss.tar.gz
+wget http://www.makemkv.com/download/makemkv-bin-$version.tar.gz
+mv makemkv-bin-$version.tar.gz /src/makemkv-bin.tar.gz