diff --git a/package/avm/nagios/nagios.conf b/package/avm/nagios/nagios.conf
new file mode 100644
index 000000000..5b3f62cbc
--- /dev/null
+++ b/package/avm/nagios/nagios.conf
@@ -0,0 +1,15 @@
+if [ "$prefix_auto" = 1 ] ; then
+	prefix="/opt/nagios"
+    set_confopt
+fi
+
+nagios_postm() {
+	 echo "xsrctar is $xsrctar"
+	 if [[ $xsrctar != *nagios-plugins* ]]; then
+		make $makeopt fullinstall
+		make $makeopt install-config
+	 fi
+}
+
+hook_add inmake 3 "make $makeopt all"
+hook_add postmake 3 "nagios_postm"
diff --git a/package/avm/nagios/nagios.desc b/package/avm/nagios/nagios.desc
new file mode 100644
index 000000000..55d15264d
--- /dev/null
+++ b/package/avm/nagios/nagios.desc
@@ -0,0 +1,50 @@
+
+[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+[COPY] 
+[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+[COPY] Please add additional copyright information _after_ the line containing
+[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+[COPY] 
+[COPY] ROCK Linux: rock-src/package/avm/nagios/nagios.desc
+[COPY] ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
+[COPY] 
+[COPY] This program is free software; you can redistribute it and/or modify
+[COPY] it under the terms of the GNU General Public License as published by
+[COPY] the Free Software Foundation; either version 2 of the License, or
+[COPY] (at your option) any later version. A copy of the GNU General Public
+[COPY] License can be found at Documentation/COPYING.
+[COPY] 
+[COPY] Many people helped and are helping developing ROCK Linux. Please
+[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+[COPY] file for details.
+[COPY] 
+[COPY] --- ROCK-COPYRIGHT-NOTE-END ---
+
+[I] A powerful network and system monitor.
+
+[T] Nagios (formerly Netsaint) is a daemon written in C that is designed
+[T] to monitor networked hosts and services. It has the ability to notify
+[T] contacts (via email, pager or other methods) when problems arise and
+[T] are resolved. Host and service checks are performed by external
+[T] 'plugins', making it easy to write custom checks in your language of
+[T] choice. Several CGIs are included in order to allow you to view the
+[T] current and historical status via a Web browser, and a WAP interface
+[T] is also provided to allow you to acknowlege problems and disable
+[T] notifications from an internet-ready cellphone.
+
+[U] http://www.nagios.org
+
+[A] Ethan Galstad <nagios at nagios.org>
+[M] Andreas V. 'netrunner' Meier <avmeier@web.de>
+
+[C] extra/security
+
+[L] GPL
+[S] Beta
+[V] 2.0b3
+[P] X -----5---9 800.000
+
+[SRC] nagios 
+[D] 1669930173 nagios-2.0b3.tar.gz http://dl.sourceforge.net/nagios/
+[D] 1853196687 nagios-plugins-1.4.tar.gz http://dl.sourceforge.net/nagiosplug/
diff --git a/package/avm/nagios/postsysfiles.in b/package/avm/nagios/postsysfiles.in
new file mode 100644
index 000000000..79828655c
--- /dev/null
+++ b/package/avm/nagios/postsysfiles.in
@@ -0,0 +1,4 @@
+
+safe_groupadd nagios 31
+safe_useradd nagios 31 31 "Nagios" /var/empty /bin/false "*"
+