diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 64fd2ac8c..835b913f2 100644
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -99,7 +99,6 @@ etc/rc.d/init.d/template
etc/rc.d/init.d/udev
etc/rc.d/init.d/udev_retry
etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/ushare
#etc/rc.d/init.d/vdr
#etc/rc.d/init.d/vsftpd
#etc/rc.d/init.d/winbind
@@ -107,7 +106,6 @@ etc/rc.d/init.d/upnpd
#etc/rc.d/rc0.d
#etc/rc.d/rc0.d/K02mediatomb
#etc/rc.d/rc0.d/K02sslh
-#etc/rc.d/rc0.d/K02ushare
etc/rc.d/rc0.d/K08fcron
etc/rc.d/rc0.d/K28apache
etc/rc.d/rc0.d/K30sshd
@@ -136,12 +134,10 @@ etc/rc.d/rc3.d/S40fcron
#etc/rc.d/rc3.d/S98mediatomb
etc/rc.d/rc3.d/S98rc.local
#etc/rc.d/rc3.d/S98sslh
-#etc/rc.d/rc3.d/S98ushare
etc/rc.d/rc3.d/S99beep
#etc/rc.d/rc6.d
#etc/rc.d/rc6.d/K02mediatomb
#etc/rc.d/rc6.d/K02sslh
-#etc/rc.d/rc6.d/K02ushare
etc/rc.d/rc6.d/K08fcron
etc/rc.d/rc6.d/K28apache
etc/rc.d/rc6.d/K30sshd
diff --git a/config/rootfiles/packages/libdlna b/config/rootfiles/packages/libdlna
deleted file mode 100644
index 7a606d851..000000000
--- a/config/rootfiles/packages/libdlna
+++ /dev/null
@@ -1,6 +0,0 @@
-#usr/include/dlna.h
-#usr/lib/libdlna.a
-usr/lib/libdlna.so
-usr/lib/libdlna.so.0
-usr/lib/libdlna.so.0.2.3
-#usr/lib/pkgconfig/libdlna.pc
diff --git a/config/rootfiles/packages/tftp-hpa b/config/rootfiles/packages/tftpd
similarity index 100%
rename from config/rootfiles/packages/tftp-hpa
rename to config/rootfiles/packages/tftpd
diff --git a/config/rootfiles/packages/ushare b/config/rootfiles/packages/ushare
deleted file mode 100644
index 7701aa249..000000000
--- a/config/rootfiles/packages/ushare
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/ushare
-#usr/etc/init.d
-#usr/etc/init.d/ushare
-#usr/etc/ushare.conf
-var/mp3/info
-var/video/info
-etc/rc.d/init.d/ushare
-etc/rc.d/rc0.d/K02ushare
-etc/rc.d/rc6.d/K02ushare
-etc/rc.d/rc3.d/S98ushare
-#usr/share/locale/de/LC_MESSAGES/ushare.mo
-#usr/share/locale/fr/LC_MESSAGES/ushare.mo
-#var/video
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index de4cdf863..04f0404b2 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -300,7 +300,6 @@
* unzip552
* urlgrabber-3.1.0
* usbutils-0.72
-* ushare-1.1a
* util-linux-2.12r
* v4l-dvb-e9a442d3b53a-kmod-2.6.25.19
* vdr-1.6.0
diff --git a/lfs/initscripts b/lfs/initscripts
index 77f81471c..51c379430 100644
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -132,9 +132,6 @@ $(TARGET) :
ln -sf ../init.d/tmpfs /etc/rc.d/rc0.d/K85tmpfs
ln -sf ../init.d/tmpfs /etc/rc.d/rc3.d/S01tmpfs
ln -sf ../init.d/tmpfs /etc/rc.d/rc6.d/K85tmpfs
- ln -sf ../init.d/ushare /etc/rc.d/rc3.d/S98ushare
- ln -sf ../init.d/ushare /etc/rc.d/rc0.d/K02ushare
- ln -sf ../init.d/ushare /etc/rc.d/rc6.d/K02ushare
ln -sf ../init.d/mediatomb /etc/rc.d/rc3.d/S98mediatomb
ln -sf ../init.d/mediatomb /etc/rc.d/rc0.d/K02mediatomb
ln -sf ../init.d/mediatomb /etc/rc.d/rc6.d/K02mediatomb
diff --git a/lfs/libdlna b/lfs/libdlna
deleted file mode 100644
index 98e302722..000000000
--- a/lfs/libdlna
+++ /dev/null
@@ -1,85 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
-# #
-# 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 3 of the License, 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 this program. If not, see . #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 0.2.3
-
-THISAPP = libdlna-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = libdlna
-PAK_VER = 1
-
-DEPS = "ffmpeg"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 2c974f95b711e5fd07f78fc4ebfcca66
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:
- @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libdlna-0.2.3-ffmpeg_not_found.patch
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/tftp-hpa b/lfs/tftpd
similarity index 98%
rename from lfs/tftp-hpa
rename to lfs/tftpd
index 8231b3a39..2ebf84a95 100644
--- a/lfs/tftp-hpa
+++ b/lfs/tftpd
@@ -31,8 +31,8 @@ DL_FILE = $(THISAPP).tar.bz2
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = tftp-hpa
-PAK_VER = 3
+PROG = tftpd
+PAK_VER = 1
DEPS = ""
diff --git a/lfs/ushare b/lfs/ushare
deleted file mode 100644
index 672e89315..000000000
--- a/lfs/ushare
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# #
-# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
-# #
-# 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 3 of the License, 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 this program. If not, see . #
-# #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = 1.1a
-
-THISAPP = ushare-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-PROG = ushare
-PAK_VER = 1
-
-DEPS = "libdlna"
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 5bbcdbf1ff85a9710fa3d4e82ccaa251
-
-install : $(TARGET)
-
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-dist:
- @$(PAK)
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
-
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
-
-$(subst %,%_MD5,$(objects)) :
- @$(MD5)
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix='/usr' --enable-dlna
- cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
- cd $(DIR_APP) && make install
- -mkdir -p /var/mp3 /var/video
- echo Folder for media files > /var/video/info
- echo Folder for music files > /var/mp3/info
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index de92e58a2..a2499ca10 100755
--- a/make.sh
+++ b/make.sh
@@ -571,7 +571,7 @@ buildipfire() {
ipfiremake hostapd
ipfiremake urlgrabber
ipfiremake syslinux
- ipfiremake tftp-hpa
+ ipfiremake tftpd
ipfiremake cpufrequtils
ipfiremake dbus
ipfiremake bluetooth
@@ -585,8 +585,6 @@ buildipfire() {
ipfiremake splix
ipfiremake streamripper
ipfiremake sshfs
- ipfiremake libdlna
- ipfiremake ushare
ipfiremake sqlite
ipfiremake taglib
ipfiremake mediatomb
diff --git a/src/initscripts/init.d/ushare b/src/initscripts/init.d/ushare
deleted file mode 100644
index f7c0b696d..000000000
--- a/src/initscripts/init.d/ushare
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/
-#
-# Description : ushare initscript
-#
-# Authors : Arne Fitzenreiter
-#
-# Version : 01.00
-#
-# Notes : for www.ipfire.org - GPLv3
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "$1" in
- start)
- boot_mesg "Starting uShare uPnP Mediaserver..."
- route add -net 239.0.0.0 netmask 255.0.0.0 green0
- loadproc sudo -u nobody /usr/bin/ushare -n $(hostname -f) \
- -i green0 --no-web --no-telnet \
- -c /var/mp3 -c /var/video -D > /dev/null 2>&1
- evaluate_retval
- ;;
-
- stop)
- boot_mesg "Stopping uShare uPnP Mediaserver..."
- killproc /usr/bin/ushare
- evaluate_retval
- route del -net 239.0.0.0 netmask 255.0.0.0 green0
- ;;
-
- restart)
- ${0} stop
- sleep 1
- ${0} start
-
- ;;
- status)
- statusproc /usr/bin/ushare
- ;;
-
- *)
- echo "Usage: ${0} {start|stop|reload|restart|status}"
- exit 1
- ;;
-esac
-
-# End $rc_base/init.d/
diff --git a/src/paks/tftp-hpa/install.sh b/src/paks/tftpd/install.sh
similarity index 100%
rename from src/paks/tftp-hpa/install.sh
rename to src/paks/tftpd/install.sh
diff --git a/src/paks/tftp-hpa/uninstall.sh b/src/paks/tftpd/uninstall.sh
similarity index 100%
rename from src/paks/tftp-hpa/uninstall.sh
rename to src/paks/tftpd/uninstall.sh
diff --git a/src/paks/tftp-hpa/update.sh b/src/paks/tftpd/update.sh
similarity index 100%
rename from src/paks/tftp-hpa/update.sh
rename to src/paks/tftpd/update.sh