diff --git a/config/rootfiles/core/31/filelists/files b/config/rootfiles/core/31/filelists/files
index 10f4300fe..17a477c22 100644
--- a/config/rootfiles/core/31/filelists/files
+++ b/config/rootfiles/core/31/filelists/files
@@ -1,2 +1,5 @@
+srv/web/ipfire/cgi-bin/chpasswd.cgi
+srv/web/ipfire/cgi-bin/urlfilter.cgi
 etc/system-release
 boot/grub/grub.conf
+etc/ppp/ip-up
diff --git a/config/rootfiles/packages/joe b/config/rootfiles/packages/joe
index ec0e0e26d..164ec79d9 100644
--- a/config/rootfiles/packages/joe
+++ b/config/rootfiles/packages/joe
@@ -1,71 +1,77 @@
+#usr/bin/jmacs
 usr/bin/joe
+#usr/bin/jpico
+#usr/bin/jstar
 usr/bin/rjoe
-usr/share/doc/joe
-usr/share/doc/joe/LIST
-usr/share/doc/joe/README
-usr/share/doc/joe/HINTS
-usr/share/doc/joe/ChangeLog
-usr/share/doc/joe/HACKING
-usr/share/doc/joe/NEWS
-usr/share/man/man1/joe.1
-usr/share/man/ru/man1/joe.1
-usr/share/joe
-usr/share/joe/lang
-usr/share/joe/lang/ru.po
-usr/share/joe/lang/de.po
-usr/share/joe/lang/fr.po
-usr/share/joe/lang/uk.po
-usr/share/joe/syntax
-usr/share/joe/syntax/c.jsf
-usr/share/joe/syntax/perl.jsf
-usr/share/joe/syntax/verilog.jsf
-usr/share/joe/syntax/conf.jsf
-usr/share/joe/syntax/python.jsf
-usr/share/joe/syntax/php.jsf
-usr/share/joe/syntax/sh.jsf
-usr/share/joe/syntax/mail.jsf
-usr/share/joe/syntax/pascal.jsf
-usr/share/joe/syntax/html.jsf
-usr/share/joe/syntax/vhdl.jsf
-usr/share/joe/syntax/fortran.jsf
-usr/share/joe/syntax/java.jsf
-usr/share/joe/syntax/xml.jsf
-usr/share/joe/syntax/tcl.jsf
-usr/share/joe/syntax/lisp.jsf
-usr/share/joe/syntax/csh.jsf
-usr/share/joe/syntax/mason.jsf
-usr/share/joe/syntax/diff.jsf
-usr/share/joe/syntax/asm.jsf
-usr/share/joe/syntax/tex.jsf
-usr/share/joe/syntax/css.jsf
-usr/share/joe/syntax/ocaml.jsf
-usr/share/joe/syntax/4gl.jsf
-usr/share/joe/syntax/sml.jsf
-usr/share/joe/syntax/sql.jsf
-usr/share/joe/syntax/awk.jsf
-usr/share/joe/syntax/cobol.jsf
-usr/share/joe/syntax/sed.jsf
-usr/share/joe/syntax/ps.jsf
-usr/share/joe/syntax/ada.jsf
-usr/share/joe/syntax/troff.jsf
-usr/share/joe/syntax/haskell.jsf
-usr/share/joe/syntax/rexx.jsf
-usr/share/joe/syntax/skill.jsf
-usr/share/joe/syntax/lua.jsf
-usr/share/joe/syntax/ruby.jsf
-usr/share/joe/syntax/m4.jsf
-usr/share/joe/syntax/joerc.jsf
-usr/share/joe/syntax/spec.jsf
-usr/share/joe/syntax/matlab.jsf
-usr/share/joe/syntax/jsf.jsf
-usr/share/joe/syntax/jsf_check.jsf
-usr/share/joe/charmaps
-usr/share/joe/charmaps/klingon
-usr/etc/joe
-usr/etc/joe/joerc
+#usr/bin/termidx
+#usr/etc/joe
+usr/etc/joe/ftyperc
 usr/etc/joe/jicerc.ru
 usr/etc/joe/jmacsrc
+usr/etc/joe/joerc
+usr/etc/joe/jpicorc
 usr/etc/joe/jstarrc
 usr/etc/joe/rjoerc
-usr/etc/joe/jpicorc
-usr/etc/joe/ftyperc
+#usr/share/doc/joe
+#usr/share/doc/joe/ChangeLog
+#usr/share/doc/joe/HACKING
+#usr/share/doc/joe/HINTS
+#usr/share/doc/joe/LIST
+#usr/share/doc/joe/NEWS
+#usr/share/doc/joe/README
+#usr/share/joe
+#usr/share/joe/charmaps
+usr/share/joe/charmaps/klingon
+#usr/share/joe/lang
+usr/share/joe/lang/de.po
+#usr/share/joe/lang/fr.po
+#usr/share/joe/lang/ru.po
+usr/share/joe/lang/uk.po
+#usr/share/joe/syntax
+usr/share/joe/syntax/4gl.jsf
+usr/share/joe/syntax/ada.jsf
+usr/share/joe/syntax/asm.jsf
+usr/share/joe/syntax/awk.jsf
+usr/share/joe/syntax/c.jsf
+usr/share/joe/syntax/cobol.jsf
+usr/share/joe/syntax/conf.jsf
+usr/share/joe/syntax/csh.jsf
+usr/share/joe/syntax/css.jsf
+usr/share/joe/syntax/diff.jsf
+usr/share/joe/syntax/fortran.jsf
+usr/share/joe/syntax/haskell.jsf
+usr/share/joe/syntax/html.jsf
+usr/share/joe/syntax/java.jsf
+usr/share/joe/syntax/joerc.jsf
+usr/share/joe/syntax/jsf.jsf
+usr/share/joe/syntax/jsf_check.jsf
+usr/share/joe/syntax/lisp.jsf
+usr/share/joe/syntax/lua.jsf
+usr/share/joe/syntax/m4.jsf
+usr/share/joe/syntax/mail.jsf
+usr/share/joe/syntax/mason.jsf
+usr/share/joe/syntax/matlab.jsf
+usr/share/joe/syntax/ocaml.jsf
+usr/share/joe/syntax/pascal.jsf
+usr/share/joe/syntax/perl.jsf
+usr/share/joe/syntax/php.jsf
+usr/share/joe/syntax/ps.jsf
+usr/share/joe/syntax/python.jsf
+usr/share/joe/syntax/rexx.jsf
+usr/share/joe/syntax/ruby.jsf
+usr/share/joe/syntax/sed.jsf
+usr/share/joe/syntax/sh.jsf
+usr/share/joe/syntax/skill.jsf
+usr/share/joe/syntax/sml.jsf
+usr/share/joe/syntax/spec.jsf
+usr/share/joe/syntax/sql.jsf
+usr/share/joe/syntax/tcl.jsf
+usr/share/joe/syntax/tex.jsf
+usr/share/joe/syntax/troff.jsf
+usr/share/joe/syntax/verilog.jsf
+usr/share/joe/syntax/vhdl.jsf
+usr/share/joe/syntax/xml.jsf
+usr/share/man/man1/joe.1
+#usr/share/man/ru
+#usr/share/man/ru/man1
+#usr/share/man/ru/man1/joe.1
diff --git a/config/rootfiles/packages/mediatomb-disabled b/config/rootfiles/packages/mediatomb
similarity index 99%
rename from config/rootfiles/packages/mediatomb-disabled
rename to config/rootfiles/packages/mediatomb
index f94df6310..5f08e9152 100644
--- a/config/rootfiles/packages/mediatomb-disabled
+++ b/config/rootfiles/packages/mediatomb
@@ -3,6 +3,7 @@ usr/bin/mediatomb
 #usr/share/mediatomb
 #usr/share/mediatomb/js
 usr/share/mediatomb/js/common.js
+usr/share/mediatomb/js/import-dvd.js
 usr/share/mediatomb/js/import.js
 usr/share/mediatomb/js/playlists.js
 usr/share/mediatomb/mappings.xml
@@ -94,9 +95,9 @@ usr/share/mediatomb/web/std_treelook.css
 usr/share/mediatomb/web/top.html
 usr/share/mediatomb/web/topleft.html
 usr/share/mediatomb/web/topright.html
+var/ipfire/backup/addons/includes/mediatomb
 var/ipfire/mediatomb
 #var/ipfire/mediatomb/config.xml
-var/ipfire/backup/addons/includes/mediatomb
 etc/rc.d/init.d/mediatomb
 etc/rc.d/rc0.d/K02mediatomb
 etc/rc.d/rc6.d/K02mediatomb
diff --git a/lfs/joe b/lfs/joe
index 96b215693..e4cee9528 100644
--- a/lfs/joe
+++ b/lfs/joe
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = joe
-PAK_VER    = 0
+PAK_VER    = 1
 
 DEPS       = ""
 
diff --git a/lfs/mediatomb b/lfs/mediatomb
index 653d31cf4..73e5c807e 100644
--- a/lfs/mediatomb
+++ b/lfs/mediatomb
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 0.11.0
+VER        = svn2020
 
 THISAPP    = mediatomb-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mediatomb
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "sqlite taglib"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 661f08933830d920de21436fe122fb15
+$(DL_FILE)_MD5 = 7fb4ef41da88f82eb1d0acb160104874
 
 install : $(TARGET)
 
@@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure --prefix=/usr
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
diff --git a/make.sh b/make.sh
index cf085774c..2f69a4c92 100755
--- a/make.sh
+++ b/make.sh
@@ -605,7 +605,7 @@ buildipfire() {
   ipfiremake sshfs
   ipfiremake sqlite
   ipfiremake taglib
-#  ipfiremake mediatomb
+  ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
diff --git a/src/ppp/ip-up b/src/ppp/ip-up
index 4ce95a505..683b15504 100644
--- a/src/ppp/ip-up
+++ b/src/ppp/ip-up
@@ -47,12 +47,13 @@ else
 	echo -n "$DNS1" > /var/ipfire/red/dns1
 	echo -n "$DNS2" > /var/ipfire/red/dns2
 fi
-7
+
 echo -n "$1" > /var/ipfire/red/iface
 echo -n "$4" > /var/ipfire/red/local-ipaddress
 echo -n "$5" > /var/ipfire/red/remote-ipaddress
 touch /var/ipfire/red/active
 
+/sbin/ip route replace default via ${IPREMOTE} dev ppp0
 run_subdir ${rc_base}/init.d/networking/red.up/
 
 #Check if gateway has answerd to ping, if not replace with ping.ipfire.org
@@ -79,3 +80,4 @@ fi
 mv /tmp/hosts /etc/hosts
 
 [ -e "/var/ipfire/ppp/nobeeps" ] || /etc/rc.d/init.d/beep up
+