diff --git a/.gitignore b/.gitignore
index 431bc8f..c7afe42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.*
 libtool
 Makefile
 xbmc-addon-xvdr-*.tar.gz
+addon-repository
+pvr.vdr.xvdr-*.zip
diff --git a/Makefile.am b/Makefile.am
index 21dfa3e..3a71e21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,12 @@
 DATE = $(shell date +%Y%m%d)
 
 SUBDIRS = \
-	src \
-	addons
+	addons \
+	src
+
+DIST_SUBDIRS = \
+	$(SUBDIRS) \
+	data
 
 EXTRA_DIST = \
 	include
@@ -20,3 +24,24 @@ dist-zip-daily:
 dist-git: all
 	GIT_REV=`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h %ci" HEAD | cut -f1 -d' '` ; \
 	make VERSION=$$GIT_REV dist
+
+repo: all dist-zip
+	make -C data all
+	rm -Rf addon-repository
+	mkdir -p addon-repository/pvr.vdr.xvdr
+	cp pvr.vdr.xvdr-$(VERSION).zip addon-repository/pvr.vdr.xvdr
+	cp addons/pvr.vdr.xvdr/icon.png addon-repository/pvr.vdr.xvdr
+	cp data/addons.xml addon-repository
+	cp data/addons.xml.md5 addon-repository
+
+repo-daily: all dist-zip-daily
+	make -C data all
+	rm -Rf addon-repository
+	mkdir -p addon-repository/pvr.vdr.xvdr
+	cp pvr.vdr.xvdr-$(VERSION).$(DATE).zip addon-repository/pvr.vdr.xvdr
+	cp addons/pvr.vdr.xvdr/icon.png addon-repository/pvr.vdr.xvdr
+	cat data/addons.xml | sed "s/$(VERSION)/$(VERSION).$(DATE)/g" > addon-repository/addons.xml
+	cd addon-repository && md5sum addons.xml > addons.xml.md5
+
+release-repo-daily: repo-daily
+	cp -r addon-repository/* ~/Dropbox/Public/xbmc-addon-xvdr
diff --git a/addons/pvr.vdr.xvdr/.gitignore b/addons/pvr.vdr.xvdr/.gitignore
index a9fc83f..15936e3 100644
--- a/addons/pvr.vdr.xvdr/.gitignore
+++ b/addons/pvr.vdr.xvdr/.gitignore
@@ -1 +1,2 @@
 XBMC_VDR_xvdr.pvr
+addon.xml
diff --git a/addons/pvr.vdr.xvdr/Makefile.am b/addons/pvr.vdr.xvdr/Makefile.am
index e170302..28b4d25 100644
--- a/addons/pvr.vdr.xvdr/Makefile.am
+++ b/addons/pvr.vdr.xvdr/Makefile.am
@@ -5,6 +5,9 @@ addon_DATA = \
 	XBMC_VDR_xvdr.pvr \
 	icon.png
 
+XBMC_VDR_xvdr.pvr:
+	make -C ../../src
+
 install-data-hook: XBMC_VDR_xvdr.pvr
 	-cp -Rf $(srcdir)/resources $(DESTDIR)$(addondir)
 	chmod -R +w $(DESTDIR)$(addondir)/resources
diff --git a/addons/pvr.vdr.xvdr/addon.xml b/addons/pvr.vdr.xvdr/addon.xml.in
similarity index 72%
rename from addons/pvr.vdr.xvdr/addon.xml
rename to addons/pvr.vdr.xvdr/addon.xml.in
index 4714e6d..c3cd75c 100644
--- a/addons/pvr.vdr.xvdr/addon.xml
+++ b/addons/pvr.vdr.xvdr/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.vdr.xvdr"
-  version="0.9.5"
+  version="@VERSION@"
   name="VDR XVDR Client"
   provider-name="Alexander Pipelka, Alwin Esch, Team XBMC">
   <requires>
@@ -20,4 +20,11 @@
     <disclaimer>This is unstable software! The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
     <platform>all</platform>
   </extension>
+  <extension
+    point="xbmc.addon.repository"
+    name="XVDR Add-on Repository">
+    <info compressed="false">http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/addons.xml</info>
+    <checksum>http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/addons.xml.md5</checksum>
+    <datadir zip="true">http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/addons.xml</datadir>
+  </extension>
 </addon>
diff --git a/configure.in b/configure.in
index abc49bc..f5db5c4 100755
--- a/configure.in
+++ b/configure.in
@@ -34,11 +34,16 @@ if test x$zlib_found = xyes; then
         AC_SUBST(ZLIB_LIBS)
 fi
 
+AC_SUBST(VERSIONEXT)
+
 # Finally create all the generated files
 AC_OUTPUT([
 Makefile
 addons/Makefile
 addons/pvr.vdr.xvdr/Makefile
+addons/pvr.vdr.xvdr/addon.xml
+data/addons.xml
+data/Makefile
 src/Makefile
 src/libTcpSocket/Makefile
 src/xvdr/Makefile
diff --git a/data/.gitignore b/data/.gitignore
new file mode 100644
index 0000000..038d13b
--- /dev/null
+++ b/data/.gitignore
@@ -0,0 +1,2 @@
+addons.xml
+addons.xml.md5
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..8c74ba1
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,11 @@
+all: addons.xml.md5
+
+addons.xml.md5: addons.xml
+	md5sum addons.xml > addons.xml.md5
+
+clean:
+	rm -f addons.xml
+	rm -f addons.xml.md5
+
+EXTRA_DIST = \
+	addons.xml.in
diff --git a/data/addons.xml.in b/data/addons.xml.in
new file mode 100644
index 0000000..d9adcc4
--- /dev/null
+++ b/data/addons.xml.in
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addons>
+  <addon id="pvr.vdr.xvdr"  name="VDR XVDR Client" provider-name="Alexander Pipelka" version="@VERSION@">
+    <requires>
+      <c-pluff version="0.1"/>
+    </requires>
+    <extension
+      point="xbmc.pvrclient"
+      library_linux="XBMC_VDR_xvdr.pvr"
+      library_osx="XBMC_VDR_xvdr.pvr"
+      library_wingl="XBMC_VDR_xvdr_WIN32.pvr"
+      library_windx="XBMC_VDR_xvdr_WIN32.pvr"/>
+    <extension point="xbmc.addon.metadata">
+      <summary>PVR client to connect VDR to XBMC</summary>
+      <description>VDR frontend; supporting streaming of Live TV &amp; Recordings, EPG, Timers</description>
+      <description lang="de">Erlaubt das wiedergeben von Live TV und Aufnahmen mittels VDR auf XBMC. Des weiteren werden EPG, Kanalsuche und Timer unterstützt.</description>
+      <disclaimer>This is unstable software! The authors are in no way responsible for failed recordings, incorrect timers, wasted hours, or any other undesirable effects..</disclaimer>
+      <platform>all</platform>
+    </extension>
+  </addon>
+</addons>