diff --git a/config/rootfiles/packages/arptables b/config/rootfiles/packages/arptables
new file mode 100644
index 000000000..7aaf4919d
--- /dev/null
+++ b/config/rootfiles/packages/arptables
@@ -0,0 +1,5 @@
+#etc/rc.d/init.d/arptables
+#usr/local/man/man8/arptables.8
+usr/local/sbin/arptables
+usr/local/sbin/arptables-restore
+usr/local/sbin/arptables-save
diff --git a/config/rootfiles/packages/ebtables b/config/rootfiles/packages/ebtables
new file mode 100644
index 000000000..60e74f395
--- /dev/null
+++ b/config/rootfiles/packages/ebtables
@@ -0,0 +1,27 @@
+etc/ethertypes
+#etc/rc.d/init.d/ebtables
+#etc/sysconfig/ebtables-config
+usr/lib/libebt_802_3.so
+usr/lib/libebt_among.so
+usr/lib/libebt_arp.so
+usr/lib/libebt_arpreply.so
+usr/lib/libebt_ip.so
+usr/lib/libebt_limit.so
+usr/lib/libebt_log.so
+usr/lib/libebt_mark.so
+usr/lib/libebt_mark_m.so
+usr/lib/libebt_nat.so
+usr/lib/libebt_pkttype.so
+usr/lib/libebt_redirect.so
+usr/lib/libebt_standard.so
+usr/lib/libebt_stp.so
+usr/lib/libebt_ulog.so
+usr/lib/libebt_vlan.so
+usr/lib/libebtable_broute.so
+usr/lib/libebtable_filter.so
+usr/lib/libebtable_nat.so
+usr/lib/libebtc.so
+#usr/local/man/man8/ebtables.8
+usr/local/sbin/ebtables
+usr/local/sbin/ebtables-restore
+usr/local/sbin/ebtables-save
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index c23b36ab2..f45e6c0e5 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -34,6 +34,7 @@
* amavisd-new-2.5.2
* applejuice-0.30
* arping-2.05
+* arptables-v0.0.3-3
* as86-0.16.17
* asterisk-1.4.18
* atl1-1.2.40.2
@@ -70,6 +71,7 @@
* dnsmasq-2.40
* dosfstools-2.11
* e2fsprogs-1.39
+* ebtables-v2.0.8-2
* ed-0.2
* elinks-0.11.4rc0
* espgs-8.15.1
diff --git a/lfs/arptables b/lfs/arptables
new file mode 100644
index 000000000..1cbfec54d
--- /dev/null
+++ b/lfs/arptables
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# 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.0.3-3
+
+THISAPP = arptables-v$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = arptables
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3f4a8b62920a46d746ab892be7de088f
+
+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 zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/ebtables b/lfs/ebtables
new file mode 100644
index 000000000..e6cc69be4
--- /dev/null
+++ b/lfs/ebtables
@@ -0,0 +1,82 @@
+###############################################################################
+# #
+# 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 = 2.0.8-2
+
+THISAPP = ebtables-v$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = ebtables
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 66bcbcb2dcf3b981ad4e86e1720e796e
+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 zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 5c93bd30a..5c0e68487 100755
--- a/make.sh
+++ b/make.sh
@@ -548,6 +548,8 @@ buildipfire() {
ipfiremake phpSANE
ipfiremake tunctl
ipfiremake nagios
+ ipfiremake ebtables
+ ipfiremake arptables
}
buildinstaller() {