diff --git a/.travis.yml b/.travis.yml
index 0745bc5..cc2901c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,9 @@ install:
 - sudo apt-get -qq install build-essential libpng-dev libjpeg-dev
 - if [ "$CXX" = "g++" ]; then sudo apt-get -qq --allow-unauthenticated install gcc-4.9 g++-4.9; export CXX="g++-4.9" CC="gcc-4.9"; fi
 - if [ "$CXX" = "clang++" ]; then sudo apt-get -qq --allow-unauthenticated install clang-3.6; export CXX="clang++-3.6" CC="clang-3.6"; fi
-- wget http://ffmpeg.org/releases/ffmpeg-3.0.tar.bz2
-- tar xf ffmpeg-3.0.tar.bz2
-- cd ffmpeg-3.0 && ./configure --prefix=/usr --disable-static --enable-shared --disable-avdevice --disable-doc --disable-htmlpages --disable-manpages --disable-programs --disable-encoders --disable-muxers --enable-swscale --disable-yasm --enable-protocol=file --enable-protocol=http --enable-iconv  && make -j4 && sudo make install
+- wget http://ffmpeg.org/releases/ffmpeg-3.1.2.tar.bz2
+- tar xf ffmpeg-3.1.2.tar.bz2
+- cd ffmpeg-3.1.2 && ./configure --prefix=/usr --disable-static --enable-shared --disable-avdevice --disable-doc --disable-htmlpages --disable-manpages --disable-programs --disable-encoders --disable-muxers --enable-swscale --disable-yasm --enable-protocol=file --enable-protocol=http --enable-iconv  && make -j4 && sudo make install
 - cd ..
 
 script:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc47230..b9bcd5b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_POLICY(VERSION 2.8)
 SET(PACKAGE "ffmpegthumbnailer")
 SET(PACKAGE_VERSION_MAJOR 2)
 SET(PACKAGE_VERSION_MINOR 1)
-SET(PACKAGE_VERSION_PATCH 1)
+SET(PACKAGE_VERSION_PATCH 2)
 SET(PACKAGE_VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH})
 
 SET(CPACK_PACKAGE_NAME ${PACKAGE})
@@ -160,7 +160,7 @@ IF (HAVE_PNG)
 ENDIF ()
 
 SET (FFMPEGTHUMBNAILER_SOVERSION_MAJOR 4)
-SET (FFMPEGTHUMBNAILER_SOVERSION_MINOR 11)
+SET (FFMPEGTHUMBNAILER_SOVERSION_MINOR 12)
 SET (FFMPEGTHUMBNAILER_SOVERSION_PATCH 0)
 
 ADD_DEFINITIONS("-D__STDC_CONSTANT_MACROS")
diff --git a/ChangeLog b/ChangeLog
index 9c419ed..1979f22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+FFmpegThumbnailer 2.1.2
+- Restored deinterlace functionality using the libavfilter library (additional ffmpeg dependency)
+- Additional video mime types added to the thumbnailer file
+- Take rotation metadata into account when generating thumbnails
+
 FFmpegThumbnailer 2.1.1
 - Buildable agains latest ffmpeg (currently breaks deinterlacing)
 - Fallback when smart frame detection fails (thanks to johnnydeez)