diff --git a/.gitignore b/.gitignore
index 796b96d..07c2591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /build
+pvr.octonet/addon.xml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81d0cad..54923df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,11 @@ set(OCTONET_SOURCES
 	src/Socket.cpp
 	src/rtsp_client.cpp)
 
+set(OCTONET_HEADERS
+	src/client.h
+	src/OctonetData.h
+	src/Socket.h)
+
 build_addon(pvr.octonet OCTONET DEPLIBS)
 
 if(WIN32)
diff --git a/pvr.octonet/addon.xml b/pvr.octonet/addon.xml.in
similarity index 84%
rename from pvr.octonet/addon.xml
rename to pvr.octonet/addon.xml.in
index 8b83d04..09a0313 100644
--- a/pvr.octonet/addon.xml
+++ b/pvr.octonet/addon.xml.in
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
 	id="pvr.octonet"
-	version="0.3.6"
+	version="0.3.7"
 	name="Digital Devices Octopus NET Client"
 	provider-name="digitaldevices">
-	<requires>
-		<c-pluff version="0.1" />
-		<import addon="xbmc.pvr" version="5.2.2" />
-	</requires>
+	<requires>@ADDON_DEPENDS@</requires>
 	<extension
 		point="xbmc.pvrclient"
 		library_linux="pvr.octonet.so"