diff --git a/packages/network/openssh/meta b/packages/network/openssh/meta
index c869342df1..e9abd1b200 100644
--- a/packages/network/openssh/meta
+++ b/packages/network/openssh/meta
@@ -34,3 +34,8 @@ PKG_LONGDESC="This is a Linux port of OpenBSD's excellent OpenSSH. OpenSSH is ba
 PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="yes"
+
+if [ "$SSHGUARD_SUPPORT" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS sshguard"
+fi
+
diff --git a/packages/security/sshguard/build b/packages/security/sshguard/build
new file mode 100755
index 0000000000..ffcc37562c
--- /dev/null
+++ b/packages/security/sshguard/build
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  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 2, 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+cd $PKG_BUILD
+ac_cv_func_malloc_0_nonnull=yes \
+./configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --datadir=/usr/share \
+            --localstatedir=/var \
+            --with-firewall="iptables" \
+            --with-iptables="/usr/sbin/iptables" \
+
+make
diff --git a/packages/security/sshguard/install b/packages/security/sshguard/install
new file mode 100755
index 0000000000..a3f545d922
--- /dev/null
+++ b/packages/security/sshguard/install
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  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 2, 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+mkdir -p $INSTALL/usr/sbin
+  cp -P $PKG_BUILD/src/sshguard $INSTALL/usr/sbin
diff --git a/packages/security/sshguard/meta b/packages/security/sshguard/meta
new file mode 100644
index 0000000000..9ef7d674dc
--- /dev/null
+++ b/packages/security/sshguard/meta
@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  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 2, 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 OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="sshguard"
+PKG_VERSION="1.5"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="http://www.sshguard.net/"
+PKG_URL="$SOURCEFORGE_SRC/project/sshguard/sshguard/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="iptables"
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="security"
+PKG_SHORTDESC="sshguard: monitors servers from their logging activity."
+PKG_LONGDESC="Sshguard monitors servers from their logging activity. When logs convey that someone is doing a Bad Thing, sshguard reacts by blocking he/she/it for a bit. Sshguard has a touchy personality: when a naughty tyke insists disturbing your host, it reacts firmer and firmer."
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"
diff --git a/projects/ATV/options b/projects/ATV/options
index 7bb8a9ad2a..3e318296b1 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -155,6 +155,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 687dbe2736..03b1080c8b 100644
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -155,6 +155,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Generic/options b/projects/Generic/options
index 63a63d2288..85697f0b8e 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -155,6 +155,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/ION/options b/projects/ION/options
index 08d196c982..b6d24bbf64 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -155,6 +155,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Intel/options b/projects/Intel/options
index 45e6faa44f..6cb3315cdb 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -155,6 +155,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 46200a8d7a..44f74c36fa 100644
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -155,6 +155,9 @@
 # build and install SFTP Server (yes / no)
   SFTP_SERVER="yes"
 
+# build and install SSH Guard (yes / no)
+  SSHGUARD_SUPPORT="yes"
+
 # build and install diskmounter service (udisks)
 # this service provide auto mounting support for external drives
 # in the mediacenter also automount internally drives at boottime (yes / no)