diff --git a/config/rootfiles/core/12/files b/config/rootfiles/core/12/files
index e608375bc..ff52c1481 100644
--- a/config/rootfiles/core/12/files
+++ b/config/rootfiles/core/12/files
@@ -129,3 +129,5 @@ lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/media/video/v4l2-common.ko
 etc/udev/dvb.sh
 etc/udev/rules.d/10-dvb.rules
 srv/web/ipfire/cgi-bin/services.cgi
+lib/modules/2.6.16.57-ipfire/kernel/drivers/usb/net/dm9601.ko
+lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/usb/net/dm9601.ko
diff --git a/config/rootfiles/packages/ffmpeg b/config/rootfiles/packages/ffmpeg
new file mode 100644
index 000000000..ab584f64f
--- /dev/null
+++ b/config/rootfiles/packages/ffmpeg
@@ -0,0 +1,64 @@
+usr/local/bin/ffmpeg
+usr/local/bin/ffplay
+usr/local/bin/ffserver
+#usr/local/include/libavcodec
+#usr/local/include/libavcodec/avcodec.h
+#usr/local/include/libavcodec/opt.h
+#usr/local/include/libavdevice
+#usr/local/include/libavdevice/avdevice.h
+#usr/local/include/libavformat
+#usr/local/include/libavformat/avformat.h
+#usr/local/include/libavformat/avio.h
+#usr/local/include/libavformat/rtsp.h
+#usr/local/include/libavformat/rtspcodes.h
+#usr/local/include/libavutil
+#usr/local/include/libavutil/adler32.h
+#usr/local/include/libavutil/avstring.h
+#usr/local/include/libavutil/avutil.h
+#usr/local/include/libavutil/base64.h
+#usr/local/include/libavutil/common.h
+#usr/local/include/libavutil/crc.h
+#usr/local/include/libavutil/fifo.h
+#usr/local/include/libavutil/intfloat_readwrite.h
+#usr/local/include/libavutil/log.h
+#usr/local/include/libavutil/lzo.h
+#usr/local/include/libavutil/mathematics.h
+#usr/local/include/libavutil/md5.h
+#usr/local/include/libavutil/mem.h
+#usr/local/include/libavutil/random.h
+#usr/local/include/libavutil/rational.h
+#usr/local/include/libavutil/sha1.h
+#usr/local/lib/libavcodec.a
+usr/local/lib/libavcodec.so
+usr/local/lib/libavcodec.so.51
+usr/local/lib/libavcodec.so.51.54.0
+#usr/local/lib/libavdevice.a
+usr/local/lib/libavdevice.so
+usr/local/lib/libavdevice.so.52
+usr/local/lib/libavdevice.so.52.0.0
+#usr/local/lib/libavformat.a
+usr/local/lib/libavformat.so
+usr/local/lib/libavformat.so.52
+usr/local/lib/libavformat.so.52.13.0
+#usr/local/lib/libavutil.a
+usr/local/lib/libavutil.so
+usr/local/lib/libavutil.so.49
+usr/local/lib/libavutil.so.49.6.0
+#usr/local/lib/pkgconfig
+usr/local/lib/pkgconfig/libavcodec.pc
+usr/local/lib/pkgconfig/libavdevice.pc
+usr/local/lib/pkgconfig/libavformat.pc
+usr/local/lib/pkgconfig/libavutil.pc
+#usr/local/lib/vhook
+usr/local/lib/vhook/drawtext.so
+usr/local/lib/vhook/fish.so
+usr/local/lib/vhook/null.so
+usr/local/lib/vhook/ppm.so
+usr/local/lib/vhook/watermark.so
+#usr/local/include/libpostproc
+#usr/local/include/libpostproc/postprocess.h
+#usr/local/lib/libpostproc.a
+usr/local/lib/libpostproc.so
+usr/local/lib/libpostproc.so.51
+usr/local/lib/libpostproc.so.51.1.0
+usr/local/lib/pkgconfig/libpostproc.pc
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index 205e68c68..646e55ac5 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -49,7 +49,6 @@ usr/bin/git-get-tar-commit-id
 usr/bin/git-grep
 usr/bin/git-gui
 usr/bin/git-hash-object
-usr/bin/git-help--browse
 usr/bin/git-http-fetch
 usr/bin/git-http-push
 usr/bin/git-imap-send
@@ -135,6 +134,7 @@ usr/bin/git-upload-pack
 usr/bin/git-var
 usr/bin/git-verify-pack
 usr/bin/git-verify-tag
+usr/bin/git-web--browse
 usr/bin/git-whatchanged
 usr/bin/git-write-tree
 #usr/bin/gitk
@@ -155,6 +155,7 @@ usr/share/git-core/templates/hooks/post-update
 usr/share/git-core/templates/hooks/pre-applypatch
 usr/share/git-core/templates/hooks/pre-commit
 usr/share/git-core/templates/hooks/pre-rebase
+usr/share/git-core/templates/hooks/prepare-commit-msg
 usr/share/git-core/templates/hooks/update
 usr/share/git-core/templates/info
 usr/share/git-core/templates/info/exclude
@@ -197,6 +198,7 @@ usr/share/git-core/templates/info/exclude
 #usr/share/git-gui/lib/remote.tcl
 #usr/share/git-gui/lib/remote_branch_delete.tcl
 #usr/share/git-gui/lib/shortcut.tcl
+#usr/share/git-gui/lib/spellcheck.tcl
 #usr/share/git-gui/lib/status_bar.tcl
 #usr/share/git-gui/lib/tclIndex
 #usr/share/git-gui/lib/transport.tcl
@@ -206,5 +208,6 @@ usr/share/git-core/templates/info/exclude
 #usr/share/gitk/lib
 #usr/share/gitk/lib/msgs
 #usr/share/gitk/lib/msgs/de.msg
+#usr/share/gitk/lib/msgs/it.msg
 #usr/share/man/man3/Git.3
 #usr/share/man/man3/private-Error.3
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index b0d3fa3b3..f24ec8573 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -84,6 +84,7 @@
 * ez-ipupdate-3.0.11b8
 * fcron-3.0.1
 * fetchmail-6.3.8
+* ffmpeg-export-2008-04-13
 * file-4.17
 * findutils-4.2.27
 * flex-2.5.33
@@ -98,7 +99,7 @@
 * gd-2.0.33
 * gdbm-1.8.3
 * gettext-0.14.5
-* git-1.5.4.5
+* git-1.5.5
 * glib-2.9.6
 * glibc-2.3.6
 * gmp-4.2
@@ -171,7 +172,7 @@
 * lzo-2.02
 * m4-1.4.4
 * mISDNuser-1_1_5
-* make-3.80
+* make-3.81
 * man-db-2.4.3
 * man-pages-2.34
 * mbr-1.1.8
@@ -283,6 +284,7 @@
 * vlan.1.9
 * vlc-0.8.6c
 * vsftpd-2.0.5
+* w_scan-20080105
 * wget-1.10.2
 * whatmask-1.2
 * which-2.16
diff --git a/lfs/ffmpeg b/lfs/ffmpeg
new file mode 100644
index 000000000..7a3afabe8
--- /dev/null
+++ b/lfs/ffmpeg
@@ -0,0 +1,91 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+
+
+
+VER        = 2008-04-13
+THISAPP    = ffmpeg-export-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = ffmpeg
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 017ab929ff92be552debb65c589c2183
+
+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/local \
+                                     --enable-shared \
+				     --enable-postproc \
+				     --enable-gpl
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && make install-libs
+	ldconfig
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/git b/lfs/git
index 4795459f4..b4868f47a 100644
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.5.4.5
+VER        = 1.5.5
 
 THISAPP    = git-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = git
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ed28e30c5e9d2a7ffe5b2268eaf8a29a
+$(DL_FILE)_MD5 = 09f15f0b0e330986d930746abf6962f4
 
 install : $(TARGET)
 
diff --git a/lfs/make b/lfs/make
index dbd197470..3a3c18a80 100644
--- a/lfs/make
+++ b/lfs/make
@@ -24,14 +24,14 @@
 
 include Config
 
-VER        = 3.80
+VER        = 3.81
 
 THISAPP    = make-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 PROG       = make
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -57,7 +57,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c68540da9302a48068d5cce1f0099477
+$(DL_FILE)_MD5 = 354853e0b2da90c527e35aabb8d6f1e6
 
 install : $(TARGET)
 
@@ -89,7 +89,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 $(EXTRA_CONFIG)
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
diff --git a/lfs/mpg123 b/lfs/mpg123
index 9d89f981f..ab3267f76 100644
--- a/lfs/mpg123
+++ b/lfs/mpg123
@@ -78,6 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/mpg123-0.59r-security-1.patch
+	cd $(DIR_APP) && patch < $(DIR_SRC)/src/patches/mpg123-0.59r-makefile.patch
 	cd $(DIR_APP) && make PREFIX=/usr linux $(MAKETUNING)
 	cd $(DIR_APP) && make PREFIX=/usr install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/w_scan b/lfs/w_scan
new file mode 100644
index 000000000..508562e9a
--- /dev/null
+++ b/lfs/w_scan
@@ -0,0 +1,86 @@
+###############################################################################
+#                                                                             #
+# 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 <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+
+VER        = 20080105
+
+THISAPP    = w_scan-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = w_scan
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 9541244559d2da9442a137f7891d45d3
+
+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 < $(DIR_SRC)/src/patches/w_scan-ipfire.patch 
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && install -m 755 w_scan /opt/vdr/bin/
+	cd $(DIR_APP) && install -m 755 w_scan_start.sh /opt/vdr/bin/
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index a2626d0cd..caf9acc3b 100755
--- a/make.sh
+++ b/make.sh
@@ -565,7 +565,9 @@ buildipfire() {
   ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
+  ipfiremake ffmpeg
   ipfiremake vdr
+  ipfiremake w_scan
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
diff --git a/src/patches/mpg123-0.59r-makefile.patch b/src/patches/mpg123-0.59r-makefile.patch
new file mode 100644
index 000000000..6afb0f204
--- /dev/null
+++ b/src/patches/mpg123-0.59r-makefile.patch
@@ -0,0 +1,12 @@
+--- Makefile	1999-06-15 22:39:06.000000000 +0200
++++ Makefile	2008-04-13 15:26:55.000000000 +0200
+@@ -104,8 +104,7 @@
+ 
+ linux:
+ 	$(MAKE) CC=gcc LDFLAGS= \
+-		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
+-			audio_oss.o term.o' \
++		OBJECTS='decode_i386.o dct64_i386.o decode_i586.o audio_oss.o term.o' \
+ 		CFLAGS='-DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DLINUX \
+ 			-DREAD_MMAP -DOSS -DTERM_CONTROL\
+ 			-Wall -O2 -m486 \
diff --git a/src/patches/phpSANE-0.3.3-fixes.patch b/src/patches/phpSANE-0.3.3-fixes.patch
old mode 100755
new mode 100644
diff --git a/src/patches/w_scan-ipfire.patch b/src/patches/w_scan-ipfire.patch
new file mode 100644
index 000000000..96c87afab
--- /dev/null
+++ b/src/patches/w_scan-ipfire.patch
@@ -0,0 +1,24 @@
+--- w_scan_start.sh.org	2008-01-05 19:58:44.000000000 +0100
++++ w_scan_start.sh	2008-04-12 18:18:19.000000000 +0200
+@@ -224,7 +224,7 @@
+ 		echo "Checking for ct-vdr style startscript.."
+ 		if [ -e /etc/init.d/vdr ]; then			# c't-vdr
+ 			echo_yes
+-			$(/etc/init.d/vdr stop)
++			/etc/init.d/vdr stop
+ 			stopped=true
+ 		else
+ 			echo_no
+@@ -692,9 +692,9 @@
+ 			echo ""
+ 			echo -e -n $NORMAL
+ 		else
+-			if [ -d /etc/vdr ]; then
+-				mv /etc/vdr/channels.conf /etc/vdr/channels.conf-backup$DATE
+-				cp channels.conf-$DATE /etc/vdr/channels.conf
++			if [ -d /opt/vdr/etc ]; then
++				mv /opt/vdr/etc/channels.conf /opt/vdr/etc/channels.conf-backup$DATE
++				cp channels.conf-$DATE /opt/vdr/etc/channels.conf
+ 			fi
+ 			if [ -d /var/lib/vdr ]; then
+ 				mv /var/lib/vdr/channels.conf /var/lib/vdr/channels.conf-backup$DATE