diff --git a/packages/addons/downloadmanager/CouchPotato/addon b/packages/addons/downloadmanager/CouchPotato/addon
new file mode 100755
index 0000000000..a6d6b3cab7
--- /dev/null
+++ b/packages/addons/downloadmanager/CouchPotato/addon
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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/$1
+  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1
+
diff --git a/packages/addons/downloadmanager/CouchPotato/install b/packages/addons/downloadmanager/CouchPotato/install
deleted file mode 100755
index d74d95d6a5..0000000000
--- a/packages/addons/downloadmanager/CouchPotato/install
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/$1
-  cp -PR $PKG_BUILD/* $ADDON_BUILD/$PKG_ADDON_ID/$1
-
diff --git a/packages/addons/downloadmanager/CouchPotato/meta b/packages/addons/downloadmanager/CouchPotato/meta
index 624ade48b4..11089c87ab 100644
--- a/packages/addons/downloadmanager/CouchPotato/meta
+++ b/packages/addons/downloadmanager/CouchPotato/meta
@@ -20,16 +20,16 @@
 ################################################################################
 
 PKG_NAME="CouchPotato"
-PKG_VERSION=""
+PKG_VERSION="datadir"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://github.com/travisghansen/CouchPotato.git"
-PKG_URL=""
+PKG_URL="http://antant.openelec.tv/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="Python Cheetah SABnzbd"
 PKG_BUILD_DEPENDS="toolchain Python"
 PKG_PRIORITY="optional"
-PKG_SECTION="plugins"
+PKG_SECTION="downloadmanager"
 PKG_SHORTDESC="CouchPotato: automated movie downloading."
 PKG_LONGDESC="CouchPotato: automated movie downloading."
 
diff --git a/packages/addons/downloadmanager/CouchPotato/patches/Remove-port-updater-and-browser-fields.patch b/packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-datadir-Remove_port_updater_and_browser_fields.patch
similarity index 100%
rename from packages/addons/downloadmanager/CouchPotato/patches/Remove-port-updater-and-browser-fields.patch
rename to packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-datadir-Remove_port_updater_and_browser_fields.patch
diff --git a/packages/addons/downloadmanager/CouchPotato/patches/Set-defaults.patch b/packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-datadir-Set_defaults.patch
similarity index 100%
rename from packages/addons/downloadmanager/CouchPotato/patches/Set-defaults.patch
rename to packages/addons/downloadmanager/CouchPotato/patches/CouchPotato-datadir-Set_defaults.patch
diff --git a/packages/addons/downloadmanager/CouchPotato/source/start.sh b/packages/addons/downloadmanager/CouchPotato/source/start.sh
index b0499daa9f..4e1078e59c 100644
--- a/packages/addons/downloadmanager/CouchPotato/source/start.sh
+++ b/packages/addons/downloadmanager/CouchPotato/source/start.sh
@@ -1,5 +1,26 @@
 #!/bin/sh
 
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
+#
+#  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
+################################################################################
+
 COUCHPOTATO_HOME="$HOME/.xbmc/userdata/addon_data/addon.downloadmanager.CouchPotato"
 COUCHPOTATO_SETTINGS="$COUCHPOTATO_HOME/settings.xml"