diff --git a/net/dmapd/Makefile b/net/dmapd/Makefile
new file mode 100644
index 000000000..ca53f6bce
--- /dev/null
+++ b/net/dmapd/Makefile
@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2009-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dmapd
+PKG_VERSION:=0.0.70
+PKG_RELEASE:=1
+
+PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
+
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILE:=COPYING
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd
+PKG_MD5SUM:=f503bf95f79b5c1f9418cccf26203952
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=2
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/dmapd
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libdmapsharing +libdb47 +vips
+  TITLE:= dmapd
+  URL:=http://www.flyn.org/projects/dmapd/
+endef
+
+define Package/dmapd/decription
+	Dmapd is a DMAP server
+endef
+
+define Package/dmapd/conffiles
+/etc/dmapd.conf
+endef
+
+TARGET_LDFLAGS+=\
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+
+define Package/dmapd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/distro/dmapd.conf $(1)/etc/
+	$(INSTALL_BIN) ./files/dmapd.init $(1)/etc/init.d/dmapd
+	$(INSTALL_DIR) $(1)/usr/lib/dmapd/$(PKG_VERSION)/modules
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/sbin/dmapd \
+		$(1)/usr/sbin/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libdmapd.so* \
+		$(1)/usr/lib/
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/dmapd/$(PKG_VERSION)/modules/*.so \
+		$(1)/usr/lib/dmapd/$(PKG_VERSION)/modules/
+endef
+
+$(eval $(call BuildPackage,dmapd))
diff --git a/net/dmapd/files/dmapd.init b/net/dmapd/files/dmapd.init
new file mode 100644
index 000000000..2d9e9aadf
--- /dev/null
+++ b/net/dmapd/files/dmapd.init
@@ -0,0 +1,30 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2009-2012 OpenWrt.org
+
+START=60
+
+start() {
+	user_exists dmapd 56 || user_add dmapd 56
+	group_exists dmapd 56 || group_add dmapd 56
+	[ -d /var/run/dmapd ] || {
+		mkdir -m 0755 -p /var/run/dmapd
+		chown dmapd:dmapd /var/run/dmapd
+	}
+	[ -d /var/db/dmapd/DAAP ] || {
+		mkdir -m 0755 -p /var/db/dmapd/DAAP
+		chown dmapd:dmapd /var/db/dmapd/DAAP
+	}
+	[ -d /var/db/dmapd/DPAP ] || {
+		mkdir -m 0755 -p /var/db/dmapd/DPAP
+		chown dmapd:dmapd /var/db/dmapd/DPAP
+	}
+	mkdir -m 0755 -p /var/lock/subsys
+	mkdir -m 0755 -p /var/media/music
+	mkdir -m 0755 -p /var/media/pictures
+
+	service_start /usr/sbin/dmapd -u dmapd -g dmapd -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k
+}
+
+stop() {
+	service_stop /usr/sbin/dmapd
+}
diff --git a/net/dmapd/patches/001-dmapd_conf.patch b/net/dmapd/patches/001-dmapd_conf.patch
new file mode 100644
index 000000000..9c1e60a33
--- /dev/null
+++ b/net/dmapd/patches/001-dmapd_conf.patch
@@ -0,0 +1,11 @@
+--- a/distro/dmapd.conf
++++ b/distro/dmapd.conf
+@@ -3,7 +3,7 @@
+ Database-Dir=/var/db/dmapd
+ 
+ # Name that will be used to identify share:
+-Share-Name=dmapd
++Share-Name=OpenWrt
+ 
+ # User that dmapd will run as, current user if undefined:
+ User=dmapd