diff --git a/packages/network/connman/meta b/packages/network/connman/meta
index b0994f57a5..cada62878b 100644
--- a/packages/network/connman/meta
+++ b/packages/network/connman/meta
@@ -19,12 +19,13 @@
 ################################################################################
 
 PKG_NAME="connman"
-PKG_VERSION="1.11"
+PKG_VERSION="499d057"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.connman.net"
-PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.xz"
+#PKG_URL="http://www.kernel.org/pub/linux/network/connman/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS="glib readline dbus systemd iptables wpa_supplicant ntp Python pygobject dbus-python"
 PKG_BUILD_DEPENDS="toolchain glib readline dbus systemd iptables"
 PKG_PRIORITY="optional"
diff --git a/tools/mkpkg/mkpkg_connman b/tools/mkpkg/mkpkg_connman
new file mode 100755
index 0000000000..f156c17be7
--- /dev/null
+++ b/tools/mkpkg/mkpkg_connman
@@ -0,0 +1,43 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d connman.git ]; then
+    git clone git://git.kernel.org/pub/scm/network/connman/connman.git -b master connman.git
+  fi
+
+  cd connman.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf connman-$GIT_REV
+  cp -R connman.git connman-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf connman-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf connman-$GIT_REV.tar.xz connman-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf connman-$GIT_REV