diff -Nru kodi-audioencoder-vorbis-1.0.1/audioencoder.vorbis/addon.xml kodi-audioencoder-vorbis-1.1.0/audioencoder.vorbis/addon.xml
--- kodi-audioencoder-vorbis-1.0.1/audioencoder.vorbis/addon.xml	2016-05-12 08:09:10.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/audioencoder.vorbis/addon.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon
-  id="audioencoder.vorbis"
-  version="1.0.0"
-  name="Vorbis Audio Encoder"
-  provider-name="spiff">
-  <requires>
-    <c-pluff version="0.1"/>
-    <import addon="xbmc.audioencoder" version="1.0.0"/>
-  </requires>
-  <extension
-    point="xbmc.audioencoder"
-    extension=".ogg"
-    library_linux="audioencoder.vorbis.so"
-    library_android="libaudioencoder.vorbis.so"
-    library_osx="audioencoder.vorbis.dylib"
-    library_windx="audioencoder.vorbis.dll"/>
-  <extension point="xbmc.addon.metadata">
-    <summary lang="en">Vorbis Audio Encoder</summary>
-    <description lang="en">Vorbis Audio Encoder</description>
-    <platform>all</platform>
-  </extension>
-</addon>
diff -Nru kodi-audioencoder-vorbis-1.0.1/audioencoder.vorbis/addon.xml.in kodi-audioencoder-vorbis-1.1.0/audioencoder.vorbis/addon.xml.in
--- kodi-audioencoder-vorbis-1.0.1/audioencoder.vorbis/addon.xml.in	2016-05-12 08:09:10.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/audioencoder.vorbis/addon.xml.in	2016-05-30 20:44:45.000000000 +0000
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="audioencoder.vorbis"
-  version="1.0.1"
+  version="1.1.0"
   name="Vorbis Audio Encoder"
   provider-name="spiff">
   <requires>
+    <c-pluff version="0.1"/>
     <import addon="xbmc.audioencoder" version="1.0.0"/>
   </requires>
   <extension
diff -Nru kodi-audioencoder-vorbis-1.0.1/CMakeLists.txt kodi-audioencoder-vorbis-1.1.0/CMakeLists.txt
--- kodi-audioencoder-vorbis-1.0.1/CMakeLists.txt	2016-05-12 08:09:10.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/CMakeLists.txt	2016-05-30 20:44:45.000000000 +0000
@@ -6,21 +6,29 @@
 
 enable_language(CXX)
 
-find_package(kodi REQUIRED)
+find_package(Kodi REQUIRED)
 find_package(Ogg REQUIRED)
 find_package(Vorbis REQUIRED)
-find_package(VorbisEnc REQUIRED)
+if(NOT WIN32)
+  find_package(VorbisEnc REQUIRED)
+endif()
+
+set(INCLUDE_DIRS ${KODI_INCLUDE_DIR}
+                 ${OGG_INCLUDE_DIRS}
+                 ${VORBIS_INCLUDE_DIRS})
+if(NOT WIN32)
+  list(APPEND INCLUDE_DIRS ${VORBISENC_INCLUDE_DIRS})
+endif()
 
-include_directories(${KODI_INCLUDE_DIR}
-                    ${OGG_INCLUDE_DIRS}
-                    ${VORBIS_INCLUDE_DIRS}
-                    ${VORBISENC_INCLUDE_DIRS})
+include_directories(${INCLUDE_DIRS})
 
 set(VORBIS_SOURCES src/EncoderVorbis.cpp)
 
-set(DEPLIBS ${VORBIS_LIBRARIES}
-            ${VORBISENC_LIBRARIES}
-            ${OGG_LIBRARIES})
+set(DEPLIBS ${OGG_LIBRARIES}
+            ${VORBIS_LIBRARIES})
+if(NOT WIN32)
+  list(APPEND DEPLIBS ${VORBISENC_LIBRARIES})
+endif()
 
 build_addon(audioencoder.vorbis VORBIS DEPLIBS)
 
diff -Nru kodi-audioencoder-vorbis-1.0.1/debian/changelog kodi-audioencoder-vorbis-1.1.0/debian/changelog
--- kodi-audioencoder-vorbis-1.0.1/debian/changelog	2016-05-12 08:11:29.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/debian/changelog	2016-08-23 09:04:06.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-audioencoder-vorbis (1.0.1-2~trusty) trusty; urgency=low
+kodi-audioencoder-vorbis (1.1.0-1~trusty) trusty; urgency=low
 
   [ xbmc ]
   * autogenerated dummy changelog
@@ -6,4 +6,4 @@
   [ wsnipex ]
   * no upstream changelog available
 
- -- wsnipex <wsnipex@a1.net>  Thu, 12 May 2016 10:11:29 +0200
+ -- wsnipex <wsnipex@a1.net>  Tue, 23 Aug 2016 11:04:06 +0200
diff -Nru kodi-audioencoder-vorbis-1.0.1/debian/changelog.tmp kodi-audioencoder-vorbis-1.1.0/debian/changelog.tmp
--- kodi-audioencoder-vorbis-1.0.1/debian/changelog.tmp	2016-05-12 08:10:36.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/debian/changelog.tmp	2016-08-23 09:03:15.000000000 +0000
@@ -1,4 +1,4 @@
-kodi-audioencoder-vorbis (1.0.1-2~#DIST#) #DIST#; urgency=low
+kodi-audioencoder-vorbis (1.1.0-1~#DIST#) #DIST#; urgency=low
 
   [ xbmc ]
   * autogenerated dummy changelog
diff -Nru kodi-audioencoder-vorbis-1.0.1/depends/common/ogg/CMakeLists.txt kodi-audioencoder-vorbis-1.1.0/depends/common/ogg/CMakeLists.txt
--- kodi-audioencoder-vorbis-1.0.1/depends/common/ogg/CMakeLists.txt	2016-05-12 08:09:10.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/depends/common/ogg/CMakeLists.txt	2016-05-30 20:44:45.000000000 +0000
@@ -5,7 +5,7 @@
 include(ExternalProject)
 externalproject_add(ogg
                     SOURCE_DIR ${CMAKE_SOURCE_DIR}
-                    UPDATE_COMMAND ""
+                    UPDATE_COMMAND autoreconf -vif <SOURCE_DIR>
                     CONFIGURE_COMMAND <SOURCE_DIR>/configure 
                       --prefix=${OUTPUT_DIR}
                       --enable-static
diff -Nru kodi-audioencoder-vorbis-1.0.1/depends/windows/ogg/CMakeLists.txt kodi-audioencoder-vorbis-1.1.0/depends/windows/ogg/CMakeLists.txt
--- kodi-audioencoder-vorbis-1.0.1/depends/windows/ogg/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/depends/windows/ogg/CMakeLists.txt	2016-05-30 20:44:45.000000000 +0000
@@ -0,0 +1,17 @@
+project(libogg)
+
+cmake_minimum_required(VERSION 2.8)
+
+add_definitions(-DWIN32 -D_WINDOWS -D_USRDLL -DLIBOGG_EXPORTS)
+
+set(LIBOGG_SOURCES src/bitwise.c
+                   src/framing.c)
+
+include_directories(${PROJECT_SOURCE_DIR}/include)
+
+add_library(ogg ${LIBOGG_SOURCES})
+
+set(HEADERS ${PROJECT_SOURCE_DIR}/include/ogg/ogg.h
+            ${PROJECT_SOURCE_DIR}/include/ogg/os_types.h)
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ogg)
+install(TARGETS ogg DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff -Nru kodi-audioencoder-vorbis-1.0.1/depends/windows/ogg/ogg.txt kodi-audioencoder-vorbis-1.1.0/depends/windows/ogg/ogg.txt
--- kodi-audioencoder-vorbis-1.0.1/depends/windows/ogg/ogg.txt	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/depends/windows/ogg/ogg.txt	2016-05-30 20:44:45.000000000 +0000
@@ -0,0 +1 @@
+ogg http://mirrors.xbmc.org/build-deps/sources/libogg-1.3.0.tar.gz
\ No newline at end of file
diff -Nru kodi-audioencoder-vorbis-1.0.1/depends/windows/vorbis/CMakeLists.txt kodi-audioencoder-vorbis-1.1.0/depends/windows/vorbis/CMakeLists.txt
--- kodi-audioencoder-vorbis-1.0.1/depends/windows/vorbis/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/depends/windows/vorbis/CMakeLists.txt	2016-05-30 20:44:45.000000000 +0000
@@ -0,0 +1,37 @@
+project(vorbis)
+
+cmake_minimum_required(VERSION 2.8)
+
+add_definitions(-DWIN32 -D_WINDOWS -D_USRDLL -DLIBVORBIS_EXPORTS)
+
+set(LIBVROBIS_SOURCES lib/analysis.c
+                      lib/bitrate.c
+                      lib/block.c
+                      lib/codebook.c
+                      lib/envelope.c
+                      lib/floor0.c
+                      lib/floor1.c
+                      lib/info.c
+                      lib/lookup.c
+                      lib/lpc.c
+                      lib/lsp.c
+                      lib/mapping0.c
+                      lib/mdct.c
+                      lib/psy.c
+                      lib/registry.c
+                      lib/res0.c
+                      lib/sharedbook.c
+                      lib/smallft.c
+                      lib/synthesis.c
+                      lib/vorbisenc.c
+                      lib/window.c)
+
+include_directories(${PROJECT_SOURCE_DIR}/include ${CMAKE_INSTALL_PREFIX}/include)
+
+add_library(vorbis ${LIBVROBIS_SOURCES})
+
+set(HEADERS ${PROJECT_SOURCE_DIR}/include/vorbis/codec.h
+            ${PROJECT_SOURCE_DIR}/include/vorbis/vorbisenc.h
+            ${PROJECT_SOURCE_DIR}/include/vorbis/vorbisfile.h)
+install(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/vorbis)
+install(TARGETS vorbis DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
diff -Nru kodi-audioencoder-vorbis-1.0.1/depends/windows/vorbis/deps.txt kodi-audioencoder-vorbis-1.1.0/depends/windows/vorbis/deps.txt
--- kodi-audioencoder-vorbis-1.0.1/depends/windows/vorbis/deps.txt	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/depends/windows/vorbis/deps.txt	2016-05-30 20:44:45.000000000 +0000
@@ -0,0 +1 @@
+ogg
\ No newline at end of file
diff -Nru kodi-audioencoder-vorbis-1.0.1/depends/windows/vorbis/vorbis.txt kodi-audioencoder-vorbis-1.1.0/depends/windows/vorbis/vorbis.txt
--- kodi-audioencoder-vorbis-1.0.1/depends/windows/vorbis/vorbis.txt	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/depends/windows/vorbis/vorbis.txt	2016-05-30 20:44:45.000000000 +0000
@@ -0,0 +1 @@
+vorbis http://mirrors.xbmc.org/build-deps/sources/libvorbis-1.3.2.tar.gz
\ No newline at end of file
diff -Nru kodi-audioencoder-vorbis-1.0.1/README.md kodi-audioencoder-vorbis-1.1.0/README.md
--- kodi-audioencoder-vorbis-1.0.1/README.md	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/README.md	2016-05-30 20:44:45.000000000 +0000
@@ -0,0 +1,28 @@
+# Vorbis Audio Encoder add-on for Kodi
+
+This is a [Kodi] (http://kodi.tv) Vorbis audio encoder add-on.
+
+#### CI Testing
+[![Build Status](https://travis-ci.org/xbmc/audioencoder.vorbis.svg?branch=master)](https://travis-ci.org/xbmc/audioencoder.vorbis)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/5120/badge.svg)](https://scan.coverity.com/projects/5120)
+
+## Build instructions
+
+When building the add-on you have to use the correct branch depending on which version of Kodi you're building against. 
+For example, if you're building the `Jarvis` branch of Kodi you should checkout the `Jarvis` branch of this repository. 
+Add-on releases are also tagged regularly.
+
+### Linux
+
+1. `git clone https://github.com/xbmc/xbmc.git`
+2. `git clone https://github.com/audioencoder.vorbis/audioencoder.vorbis.git`
+3. `cd audioencoder.vorbis && mkdir build && cd build`
+4. `cmake -DADDONS_TO_BUILD=audioencoder.vorbis -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons`
+5. `make`
+
+The add-on files will be placed in `../../xbmc/addons` so if you build Kodi from source and run it directly 
+the add-on will be available as a system add-on.
+
+##### Useful links
+
+* [Kodi's add-ons development support] (http://forum.kodi.tv/forumdisplay.php?fid=26)
diff -Nru kodi-audioencoder-vorbis-1.0.1/src/EncoderVorbis.cpp kodi-audioencoder-vorbis-1.1.0/src/EncoderVorbis.cpp
--- kodi-audioencoder-vorbis-1.0.1/src/EncoderVorbis.cpp	2016-05-12 08:09:10.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/src/EncoderVorbis.cpp	2016-05-30 20:44:45.000000000 +0000
@@ -20,7 +20,7 @@
 
 #include <ogg/ogg.h>
 #include <vorbis/vorbisenc.h>
-#include "kodi/xbmc_audioenc_dll.h"
+#include "xbmc_audioenc_dll.h"
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
diff -Nru kodi-audioencoder-vorbis-1.0.1/.travis.yml kodi-audioencoder-vorbis-1.1.0/.travis.yml
--- kodi-audioencoder-vorbis-1.0.1/.travis.yml	1970-01-01 00:00:00.000000000 +0000
+++ kodi-audioencoder-vorbis-1.1.0/.travis.yml	2016-05-30 20:44:45.000000000 +0000
@@ -0,0 +1,52 @@
+language: cpp
+
+#
+# Define the build matrix
+#
+# Travis defaults to building on Ubuntu Precise when building on 
+# Linux. We need Trusty in order to get up to date versions of 
+# cmake and g++.
+#
+env:
+  global:
+    - APPID=audioencoder.vorbis
+
+matrix:
+  include:
+    - os: linux
+      dist: trusty    
+      sudo: required
+      compiler: gcc
+    - os: linux
+      dist: trusty    
+      sudo: required
+      compiler: clang
+    - os: osx
+      osx_image: xcode7.3
+    - os: osx
+      osx_image: xcode6.1
+
+#
+# Some of the OS X images don't have cmake, contrary to what people 
+# on the Internet say
+#
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libvorbis; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq -y libtool libvorbis-dev; fi
+
+#
+# The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
+# we'll put the Kodi source on the same level
+#
+before_script:
+  - cd $TRAVIS_BUILD_DIR/..
+  - git clone --depth=1 https://github.com/xbmc/xbmc.git
+  - cd ${APPID}
+  - mkdir build
+  - cd build
+  - cmake -DADDONS_TO_BUILD=${APPID} -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/addons -DPACKAGE_ZIP=1 ../../xbmc/project/cmake/addons
+
+script: make