diff --git a/multimedia/icecast/Makefile b/multimedia/icecast/Makefile
index 1b0766e7e4..fa0f7d24db 100644
--- a/multimedia/icecast/Makefile
+++ b/multimedia/icecast/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icecast
 PKG_VERSION:=2.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=André Gaul <andre@gaul.io>
 
@@ -29,6 +29,7 @@ define Package/icecast
   CATEGORY:=Multimedia
   DEPENDS:=+libcurl +libxml2 +libxslt +libogg +libopenssl
   TITLE:=A streaming media server for Ogg/Vorbis and MP3 audio streams
+  USERID:=icecast=87:icecast=87
   URL:=http://www.icecast.org/
 endef
 
diff --git a/multimedia/icecast/files/icecast.init b/multimedia/icecast/files/icecast.init
index 355e4b7169..96b36e1886 100755
--- a/multimedia/icecast/files/icecast.init
+++ b/multimedia/icecast/files/icecast.init
@@ -1,12 +1,21 @@
 #!/bin/sh /etc/rc.common
-# Example script
-# Copyright (C) 2014 OpenWrt.org
+
+# Startup script
+# Copyright (C) 2015 OpenWrt.org
  
 USE_PROCD=1
-START=99
+START=90
 STOP=15
 
 start_service() {
+	user_exists icecast 87 || user_add icecast 87
+	group_exists icecast 87 || group_add icecast 87
+	
+	[ -d /var/log/icecast ] || {
+		mkdir -m 0755 -p /var/log/icecast
+		chown icecast:icecast /var/log/icecast
+	}
+
 	procd_open_instance
 	procd_set_param command /usr/bin/icecast -c /etc/icecast.xml
 	procd_set_param respawn
diff --git a/multimedia/icecast/patches/020-icecast_config_for_openwrt.patch b/multimedia/icecast/patches/020-icecast_config_for_openwrt.patch
new file mode 100644
index 0000000000..d3282f2edf
--- /dev/null
+++ b/multimedia/icecast/patches/020-icecast_config_for_openwrt.patch
@@ -0,0 +1,25 @@
+--- a/conf/icecast.xml.in
++++ b/conf/icecast.xml.in
+@@ -61,7 +61,7 @@
+          It affects mainly the urls generated by Icecast for playlists and yp
+          listings. You MUST configure it properly for YP listings to work!
+     -->
+-    <hostname>localhost</hostname>
++    <hostname>OpenWrt</hostname>
+ 
+     <!-- You may have multiple <listener> elements -->
+     <listen-socket>
+@@ -234,11 +234,9 @@
+ 
+     <security>
+         <chroot>0</chroot>
+-        <!--
+         <changeowner>
+-            <user>nobody</user>
+-            <group>nogroup</group>
++            <user>icecast</user>
++            <group>icecast</group>
+         </changeowner>
+-        -->
+     </security>
+ </icecast>