diff --git a/packages/devel/usbmuxd/build b/packages/devel/usbmuxd/build
new file mode 100755
index 0000000000..2817cdafa8
--- /dev/null
+++ b/packages/devel/usbmuxd/build
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. config/options $1
+
+cd $PKG_BUILD
+
+# Set the owner of the device node to be usbmuxd
+  sed -i 's/ATTR{idVendor}=="05ac"/OWNER="usbmuxd", ATTR{idVendor}=="05ac"/' udev/85-usbmuxd.rules.in
+  sed -i 's/-U usbmux/-U usbmuxd/' udev/85-usbmuxd.rules.in
+
+mkdir -p build && cd build
+
+cmake -DCMAKE_TOOLCHAIN_FILE=$CMAKE_CONF \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DLIB_SUFFIX="" \
+      ..
+
+make
+$MAKEINSTALL
diff --git a/packages/devel/usbmuxd/install b/packages/devel/usbmuxd/install
new file mode 100755
index 0000000000..04e84a7820
--- /dev/null
+++ b/packages/devel/usbmuxd/install
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+. config/options $1
+
+add_user usbmuxd x 113 113 "usbmuxd user" "/" "/bin/sh"
+add_group usbmuxd 113
+
+mkdir -p $INSTALL/usr/lib
+  cp -P $PKG_BUILD/build/libusbmuxd/libusbmuxd.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/usr/sbin
+  cp -P $PKG_BUILD/build/libusbmuxd.so* $INSTALL/usr/lib
+
+mkdir -p $INSTALL/lib/udev/rules.d
+  cp -P $PKG_BUILD/build/udev/*.rules $INSTALL/lib/udev/rules.d
+
diff --git a/packages/devel/usbmuxd/meta b/packages/devel/usbmuxd/meta
new file mode 100644
index 0000000000..f79eb85fea
--- /dev/null
+++ b/packages/devel/usbmuxd/meta
@@ -0,0 +1,16 @@
+PKG_NAME="usbmuxd"
+PKG_VERSION="1.0.6"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://marcansoft.com/uploads/"
+PKG_URL="http://marcansoft.com/uploads/usbmuxd/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libusb"
+PKG_BUILD_DEPENDS="toolchain libusb"
+PKG_PRIORITY="optional"
+PKG_SECTION="devel"
+PKG_SHORTDESC="usbmuxd: a daemon used for communicating with Apple's iPod Touch and iPhone devices."
+PKG_LONGDESC="usbmuxd is a daemon used for communicating with Apple's iPod Touch and iPhone devices. It allows multiple services on the device to be accessed simultaneously."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"
diff --git a/packages/devel/usbmuxd/patches/usbmuxd-1.0.6-version.tag.patch b/packages/devel/usbmuxd/patches/usbmuxd-1.0.6-version.tag.patch
new file mode 100644
index 0000000000..c273cd3796
--- /dev/null
+++ b/packages/devel/usbmuxd/patches/usbmuxd-1.0.6-version.tag.patch
@@ -0,0 +1,22 @@
+diff -Naur usbmuxd-1.0.6/Modules/describe.sh usbmuxd-1.0.6.patch/Modules/describe.sh
+--- usbmuxd-1.0.6/Modules/describe.sh	2010-09-28 03:32:44.000000000 +0200
++++ usbmuxd-1.0.6.patch/Modules/describe.sh	2011-01-05 14:28:41.461148284 +0100
+@@ -1,17 +1,8 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+-# Check for git and a git repo.
+-if head=`git rev-parse --verify HEAD 2>/dev/null`; then
+-	/bin/echo -n `git describe`
+-
+-	# Are there uncommitted changes?
+-	git update-index --refresh --unmerged > /dev/null
+-	git diff-index --quiet HEAD || /bin/echo -n -dirty
+-else
+ # Check for version tag
+ 	if [ -e version.tag ]; then
+ 		/bin/echo -n `cat version.tag`
+ 	fi
+-fi
+ 
+ echo