diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/addon b/packages/addons/multimedia/xbmc-addon-xvdr/addon
new file mode 100755
index 0000000000..740fcc9230
--- /dev/null
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/addon
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
+  cp -PR $PKG_BUILD/addons/pvr.vdr.xvdr/resources $ADDON_BUILD/$PKG_ADDON_ID
+  cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $ADDON_BUILD/$PKG_ADDON_ID
+  cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $ADDON_BUILD/$PKG_ADDON_ID
+  cp -P $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $ADDON_BUILD/$PKG_ADDON_ID
diff --git a/packages/mediacenter/xbmc-addon-xvdr/build b/packages/addons/multimedia/xbmc-addon-xvdr/build
similarity index 92%
rename from packages/mediacenter/xbmc-addon-xvdr/build
rename to packages/addons/multimedia/xbmc-addon-xvdr/build
index b415ce0996..794b360977 100755
--- a/packages/mediacenter/xbmc-addon-xvdr/build
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/build
@@ -28,9 +28,10 @@ cd $PKG_BUILD
   touch NEWS AUTHORS ChangeLog
   do_autoreconf
 
-CXXFLAGS="-DZLIB_INTERNAL=1" ./configure --host=$TARGET_NAME \
+CXXFLAGS="-DZLIB_INTERNAL=1" \
+./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
-            --prefix=/usr/share/xbmc \
+            --prefix=/usr \
             --disable-static \
             --enable-shared
 
diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt b/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt
new file mode 100644
index 0000000000..c9271f76dd
--- /dev/null
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/changelog.txt
@@ -0,0 +1,2 @@
+1.0.0
+- initial import of xbmc-addon-xvdr-9822a8a
diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png b/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png
new file mode 100644
index 0000000000..f8f83ae27d
Binary files /dev/null and b/packages/addons/multimedia/xbmc-addon-xvdr/icon/icon.png differ
diff --git a/packages/mediacenter/xbmc-addon-xvdr/install b/packages/addons/multimedia/xbmc-addon-xvdr/install
similarity index 93%
rename from packages/mediacenter/xbmc-addon-xvdr/install
rename to packages/addons/multimedia/xbmc-addon-xvdr/install
index 59ec12b0e6..81b096dc4b 100755
--- a/packages/mediacenter/xbmc-addon-xvdr/install
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/install
@@ -25,5 +25,5 @@
 mkdir -p $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
   cp -PRf $PKG_BUILD/addons/pvr.vdr.xvdr/resources $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
   cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/addon.xml $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
-  cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
+#  cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/icon.png $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
   cp -Pf $PKG_BUILD/addons/pvr.vdr.xvdr/XBMC_VDR_xvdr.pvr $INSTALL/usr/share/xbmc/addons/pvr.vdr.xvdr
diff --git a/packages/mediacenter/xbmc-addon-xvdr/meta b/packages/addons/multimedia/xbmc-addon-xvdr/meta
similarity index 90%
rename from packages/mediacenter/xbmc-addon-xvdr/meta
rename to packages/addons/multimedia/xbmc-addon-xvdr/meta
index 1f91892318..9b3d814d96 100644
--- a/packages/mediacenter/xbmc-addon-xvdr/meta
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/meta
@@ -20,17 +20,18 @@
 
 PKG_NAME="xbmc-addon-xvdr"
 PKG_VERSION="9822a8a"
-PKG_REV="1"
+PKG_REV="0"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE=""
+PKG_SITE="https://github.com/pipelka/xbmc-addon-xvdr"
 PKG_URL="http://dl.dropbox.com/u/240579/xbmc-addon-xvdr/xbmc-addon-xvdr-$PKG_VERSION.tar.gz"
 PKG_DEPENDS="zlib"
 PKG_BUILD_DEPENDS="toolchain zlib"
 PKG_PRIORITY="optional"
-PKG_SECTION="mediacenter"
+PKG_SECTION="multimedia/pvr"
 PKG_SHORTDESC="XVDR addon for XBMC"
 PKG_LONGDESC="This addon allows XBMC PVR to connect to the VDR server."
-PKG_IS_ADDON="no"
+PKG_IS_ADDON="yes"
+PKG_ADDON_TYPE="xbmc.python.script"
 
 PKG_AUTORECONF="no"
diff --git a/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py b/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py
new file mode 100644
index 0000000000..2085a1f96d
--- /dev/null
+++ b/packages/addons/multimedia/xbmc-addon-xvdr/source/default.py
@@ -0,0 +1,23 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+import os
+import sys
+import xbmcaddon