diff --git a/.gitignore b/.gitignore
index a711b3a9..74198b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,86 +1,87 @@
 *.swp
 Makefile.in
 aclocal.m4
 autoconf
 autoheader
 autom4te.cache
 automake
 autoscan.log
 compile
 configure
 configure.scan
 config.guess
 config.log
 config.sub
 config.status
 Makefile
 depcomp
 install-sh
 libtoolize
 ltmain.sh
 libtool
 make/stamp-h1
 m4
 make/clusterautoconfig.h*
 missing
 *.pc
 .deps
 .libs
 *.o
 *.la
 *.lo
 fence/agents/alom/fence_alom
 fence/agents/apc/fence_apc
 fence/agents/apc_snmp/fence_apc_snmp
 fence/agents/baytech/fence_baytech
 fence/agents/bladecenter/fence_bladecenter
 fence/agents/brocade/fence_brocade
 fence/agents/bullpap/fence_bullpap
 fence/agents/cisco_mds/fence_cisco_mds
 fence/agents/cisco_ucs/fence_cisco_ucs
 fence/agents/cpint/fence_cpint
 fence/agents/drac/fence_drac
 fence/agents/drac5/fence_drac5
 fence/agents/eaton_snmp/fence_eaton_snmp
 fence/agents/egenera/fence_egenera
 fence/agents/eps/fence_eps
 fence/agents/ibmblade/fence_ibmblade
 fence/agents/ifmib/fence_ifmib
 fence/agents/ilo/fence_ilo
 fence/agents/ilo_mp/fence_ilo_mp
 fence/agents/intelmodular/fence_intelmodular
 fence/agents/ipdu/fence_ipdu
 fence/agents/ipmilan/fence_ipmilan
 fence/agents/ldom/fence_ldom
 fence/agents/lib/fencing.py
 fence/agents/lib/fencing_snmp.py
 fence/agents/lib/fencing.pyc
 fence/agents/lib/fencing_snmp.pyc
 fence/agents/lpar/fence_lpar
 fence/agents/manual/fence_ack_manual
 fence/agents/mcdata/fence_mcdata
 fence/agents/netio/fence_netio
 fence/agents/node_assassin/fence_na
 fence/agents/node_assassin/fence_na.conf
 fence/agents/node_assassin/fence_na.lib
 fence/agents/node_assassin/fence_na.pod
 fence/agents/nss_wrapper/fence_nss_wrapper
 fence/agents/rackswitch/fence_rackswitch
 fence/agents/rhevm/fence_rhevm
+fence/agents/raritan/fence_raritan
 fence/agents/rsa/fence_rsa
 fence/agents/rsb/fence_rsb
 fence/agents/sanbox2/fence_sanbox2
 fence/agents/scsi/fence_scsi
 fence/agents/scsi/fence_scsi_test
 fence/agents/virsh/fence_virsh
 fence/agents/vixel/fence_vixel
 fence/agents/vmware/fence_vmware
 fence/agents/vmware/fence_vmware_helper
 fence/agents/wti/fence_wti
 fence/agents/xcat/fence_xcat
 fence/agents/zvm/fence_zvm
 fence/agents/zvm/fence_zvmip
 .fence*.tmp
 fence-agents*
 .version
 tests/devices.d/*
diff --git a/configure.ac b/configure.ac
index eaef1d8b..c24198ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,302 +1,303 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
 
 AC_INIT([fence-agents],
 	m4_esyscmd([make/git-version-gen .tarball-version]),
 	[linux-cluster@redhat.com])
 
 AM_INIT_AUTOMAKE([-Wno-portability dist-bzip2 dist-xz])
 
 LT_PREREQ([2.2.6])
 LT_INIT
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([fence/agents/rackswitch/do_rack.h])
 AC_CONFIG_HEADERS([make/clusterautoconfig.h])
 
 AC_CANONICAL_HOST
 AC_PROG_LIBTOOL
 
 AC_LANG([C])
 
 # Sanitize path
 
 if test "$prefix" = "NONE"; then
 	prefix="/usr"
 	if test "$localstatedir" = "\${prefix}/var"; then
 		localstatedir="/var"
 	fi
 	if test "$sysconfdir" = "\${prefix}/etc"; then
 		sysconfdir="/etc"
 	fi
 	if test "$libdir" = "\${exec_prefix}/lib"; then
 		if test -e /usr/lib64; then
 			libdir="/usr/lib64"
 		else
 			libdir="/usr/lib"
 		fi
 	fi
 fi
 
 case $exec_prefix in
   NONE)   exec_prefix=$prefix;;
   prefix) exec_prefix=$prefix;;
 esac
 
 # Checks for programs.
 
 # check stolen from gnulib/m4/gnu-make.m4
 if ! ${MAKE-make} --version /cannot/make/this >/dev/null 2>&1; then
 	AC_MSG_ERROR([you don't seem to have GNU make; it is required])
 fi
 
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LN_S
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_AWK
 AC_PROG_CXX
 AC_PROG_RANLIB
 
 ## local helper functions
 
 # this function checks if CC support options passed as
 # args. Global CFLAGS are ignored during this test.
 cc_supports_flag() {
 	local CFLAGS="$@"
 	AC_MSG_CHECKING([whether $CC supports "$@"])
 	AC_COMPILE_IFELSE([int main(){return 0;}] ,
 			  [RC=0; AC_MSG_RESULT([yes])],
 			  [RC=1; AC_MSG_RESULT([no])])
 	return $RC
 }
 
 # this function tests if a library has a certain function
 # by using AC_CHECK_LIB but restores the original LIBS global
 # envvar. This is required to avoid libtool to link everything
 # with everything.
 check_lib_no_libs() {
 	AC_CHECK_LIB([$1], [$2],,
 		     [AC_MSG_ERROR([Unable to find $1 library])])
 	LIBS=$ac_check_lib_save_LIBS
 }
 
 # Checks for header files.
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h netdb.h stddef.h sys/socket.h sys/time.h syslog.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UINT32_T
 
 # Checks for library functions.
 AC_FUNC_FORK
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([alarm atexit bzero dup2 memmove memset select socket strcasecmp strchr strdup strerror strtol])
 
 # local options
 AC_ARG_ENABLE([debug],
 	[  --enable-debug          enable debug build. ],
 	[ default="no" ])
 
 AC_ARG_WITH([fenceagentslibdir],
 	[  --with-fenceagentslibdir=PATH
                           installation path for fence library. ],
 	[ FENCEAGENTSLIBDIR="$withval" ],
 	[ FENCEAGENTSLIBDIR="${datadir}/fence" ])
 
 AC_ARG_WITH([snmpbin],
 	[  --with-snmpbin=PATH
                           path to snmp binaries (snmpwalk/get). ],
 	[ SNMPBIN="$withval" ],
 	[ SNMPBIN="${bindir}" ])
 
 AC_ARG_WITH([default-config-dir],
 	[  --with-default-config-dir=DIR
 			  cluster config directory. ],
 	[ DEFAULT_CONFIG_DIR="$withval" ],
 	[ DEFAULT_CONFIG_DIR="$sysconfdir/cluster" ])
 
 AC_ARG_WITH([default-config-file],
 	[  --with-default-config-file=FILE
 			  cluster config file. ],
 	[ DEFAULT_CONFIG_FILE="$withval" ],
 	[ DEFAULT_CONFIG_FILE="cluster.conf" ])
 
 AC_ARG_WITH([agents],
 	[  --with-agents=LIST
                           list of agents to build/ship (default: all). ],
 	[ AGENTS_LIST="$withval" ],
 	[ AGENTS_LIST="all" ])
 
 if test "x$AGENTS_LIST" = x; then
 	AC_ERROR([No agents selected])
 fi
 
 if test "x$AGENTS_LIST" != xall; then
 	for j in $AGENTS_LIST; do
 		if ! test -d fence/agents/$j; then
 			AC_ERROR([Agent $j does not exists])
 		fi
 	done
 fi
 
 if test "x$AGENTS_LIST" = xall; then
 	AGENTS_LIST=`find $srcdir/fence/agents -mindepth 2 -maxdepth 2 -name Makefile.am -printf '%h ' | sed -e 's#'$srcdir'/fence/agents/##g' -e 's#lib ##g' -e 's#nss_wrapper ##g'`
 fi
 
 XENAPILIB=0
 if echo "$AGENTS_LIST" | grep -q xenapi; then
 	XENAPILIB=1
 fi
 
 ## random vars
 
 LOGDIR=${localstatedir}/log/cluster
 CLUSTERVARRUN=${localstatedir}/run/cluster
 CLUSTERDATA=${datadir}/cluster
 
 ## path to 3rd-party binaries
 AC_PATH_PROG([IPMITOOL_PATH], [ipmitool], [/usr/bin/ipmitool])
 AC_PATH_PROG([AMTTOOL_PATH], [amttool], [/usr/bin/amttool])
 AC_PATH_PROG([GNUTLSCLI_PATH], [gnutlscli], [/usr/bin/gnutls-cli])
 ## do subst
 
 AC_SUBST([DEFAULT_CONFIG_DIR])
 AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_DIR], "$(eval echo ${DEFAULT_CONFIG_DIR})",
 		   [Default config directory])
 
 AC_SUBST([DEFAULT_CONFIG_FILE])
 AC_DEFINE_UNQUOTED([DEFAULT_CONFIG_FILE], "$(eval echo ${DEFAULT_CONFIG_FILE})",
 		   [Default config file])
 
 AC_SUBST([LOGDIR])
 AC_DEFINE_UNQUOTED([LOGDIR], "$(eval echo ${LOGDIR})",
 		   [Default logging directory])
 
 AC_SUBST([CLUSTERVARRUN])
 AC_DEFINE_UNQUOTED([CLUSTERVARRUN], "$(eval echo ${CLUSTERVARRUN})",
 		   [Default cluster var/run directory])
 
 AC_SUBST([CLUSTERDATA])
 AC_SUBST([FENCEAGENTSLIBDIR])
 AC_SUBST([SNMPBIN])
 AC_SUBST([AGENTS_LIST])
 AM_CONDITIONAL(BUILD_XENAPILIB, test $XENAPILIB -eq 1)
 
 AC_SUBST([IPMITOOL_PATH])
 AC_SUBST([AMTTOOL_PATH])
 
 ## *FLAGS handling
 
 ENV_CFLAGS="$CFLAGS"
 ENV_CPPFLAGS="$CPPFLAGS"
 ENV_LDFLAGS="$LDFLAGS"
 
 # debug build stuff
 if test "x${enable_debug}" = xyes; then
 	AC_DEFINE_UNQUOTED([DEBUG], [1], [Compiling Debugging code])
 	OPT_CFLAGS="-O0"
 else
 	OPT_CFLAGS="-O2"
 fi
 
 # gdb flags
 if test "x${GCC}" = xyes; then
 	GDB_FLAGS="-ggdb3"
 else
 	GDB_FLAGS="-g"
 fi
 
 # extra warnings
 EXTRA_WARNINGS=""
 
 WARNLIST="
 	all
 	shadow
 	missing-prototypes
 	missing-declarations
 	strict-prototypes
 	declaration-after-statement
 	pointer-arith
 	write-strings
 	cast-align
 	bad-function-cast
 	missing-format-attribute
 	format=2
 	format-security
 	format-nonliteral
 	no-long-long
 	unsigned-char
 	gnu89-inline
 	no-strict-aliasing
 	"
 
 for j in $WARNLIST; do
 	if cc_supports_flag -W$j; then
 		EXTRA_WARNINGS="$EXTRA_WARNINGS -W$j";
 	fi
 done
 
 CFLAGS="$ENV_CFLAGS $OPT_CFLAGS $GDB_FLAGS \
 	$EXTRA_WARNINGS $WERROR_CFLAGS"
 CPPFLAGS="-I\$(top_builddir)/make -I\$(top_srcdir)/make -I. $ENV_CPPFLAGS"
 LDFLAGS="$ENV_LDFLAGS"
 
 AC_CONFIG_FILES([Makefile
 		 fence/Makefile
 		 fence/agents/Makefile
 		 fence/agents/alom/Makefile
 		 fence/agents/apc/Makefile
 		 fence/agents/apc_snmp/Makefile
 		 fence/agents/amt/Makefile 
 		 fence/agents/baytech/Makefile
 		 fence/agents/bladecenter/Makefile
 		 fence/agents/brocade/Makefile
 		 fence/agents/bullpap/Makefile
 		 fence/agents/cisco_mds/Makefile
 		 fence/agents/cisco_ucs/Makefile
 		 fence/agents/cpint/Makefile
 		 fence/agents/drac/Makefile
 		 fence/agents/drac5/Makefile
 		 fence/agents/dummy/Makefile
 		 fence/agents/eaton_snmp/Makefile
 		 fence/agents/egenera/Makefile
 		 fence/agents/eps/Makefile
 		 fence/agents/hpblade/Makefile
 		 fence/agents/ibmblade/Makefile
 		 fence/agents/ipdu/Makefile
 		 fence/agents/ifmib/Makefile
 		 fence/agents/ilo/Makefile
 		 fence/agents/ilo_mp/Makefile
 		 fence/agents/intelmodular/Makefile
 		 fence/agents/ipmilan/Makefile
 		 fence/agents/kdump/Makefile
 		 fence/agents/ldom/Makefile
 		 fence/agents/lib/Makefile
 		 fence/agents/lpar/Makefile
 		 fence/agents/manual/Makefile
 		 fence/agents/mcdata/Makefile
 		 fence/agents/netio/Makefile
 		 fence/agents/rackswitch/Makefile
 		 fence/agents/ovh/Makefile
+		 fence/agents/raritan/Makefile
 		 fence/agents/rhevm/Makefile
 		 fence/agents/rsa/Makefile
 		 fence/agents/rsb/Makefile
 		 fence/agents/sanbox2/Makefile
 		 fence/agents/scsi/Makefile
 		 fence/agents/virsh/Makefile
 		 fence/agents/vixel/Makefile
 		 fence/agents/vmware/Makefile
 		 fence/agents/vmware_soap/Makefile
 		 fence/agents/wti/Makefile
 		 fence/agents/xcat/Makefile
 		 fence/agents/xenapi/Makefile
 		 fence/agents/hds_cb/Makefile
 		 fence/agents/zvm/Makefile
 		 doc/Makefile])
 
 AC_OUTPUT
diff --git a/fence/agents/raritan/Makefile.am b/fence/agents/raritan/Makefile.am
new file mode 100644
index 00000000..f41ba568
--- /dev/null
+++ b/fence/agents/raritan/Makefile.am
@@ -0,0 +1,17 @@
+MAINTAINERCLEANFILES	= Makefile.in
+
+TARGET			= fence_raritan
+
+SRC			= $(TARGET).py
+
+EXTRA_DIST		= $(SRC)
+
+sbin_SCRIPTS		= $(TARGET)
+
+man_MANS		= $(TARGET).8
+
+include $(top_srcdir)/make/fencebuild.mk
+include $(top_srcdir)/make/fenceman.mk
+
+clean-local: clean-man
+	rm -f $(TARGET)
diff --git a/fence/agents/raritan/fence_raritan.py b/fence/agents/raritan/fence_raritan.py
new file mode 100644
index 00000000..c8137b03
--- /dev/null
+++ b/fence/agents/raritan/fence_raritan.py
@@ -0,0 +1,98 @@
+#!/usr/bin/python
+
+import sys, re, pexpect, exceptions
+sys.path.append("@FENCEAGENTSLIBDIR@")
+from fencing import *
+
+#BEGIN_VERSION_GENERATION
+RELEASE_VERSION=""
+REDHAT_COPYRIGHT=""
+BUILD_DATE=""
+#END_VERSION_GENERATION
+
+# --plug should include path to the outlet # such as port 1:
+# /system1/outlet1
+
+def get_power_status(conn, options):
+	conn.send_eol("show -d properties=powerState %s" % options["--plug"])
+	re_status = re.compile(".*powerState is [12].*")
+	conn.log_expect(options, re_status, int(options["--shell-timeout"]))
+	status = {
+		#"0" : "off",
+		"1" : "on",
+		"2" : "off",
+	}[conn.after.split()[2]]
+
+	return status
+
+def set_power_status(conn, options):
+	action = {
+		"on" : "on",
+		"off" : "off",
+	}[options["--action"]]
+
+	conn.send_eol("set %s powerState=%s" % (options["--plug"], action))
+
+def main():
+	device_opt = [ "ipaddr", "login", "passwd", "port" ]
+
+	atexit.register(atexit_handler)
+
+	opt = process_input(device_opt)
+
+	all_opt["ipport"]["default"] = "23"
+
+	opt["eol"] = "\r\n"
+	options = check_input(device_opt, opt)
+
+	docs = { }
+	docs["shortdesc"] = "I/O Fencing agent for Raritan Dominion PX"
+	docs["longdesc"] = "fence_raritan is an I/O Fencing agent which can be \
+used with the Raritan DPXS12-20 Power Distribution Unit. It logs into \
+device via telnet and reboots a specified outlet. Lengthy telnet connections \
+should be avoided while a GFS cluster is running because the connection will \
+block any necessary fencing actions."
+	docs["vendorurl"] = "http://www.raritan.com/"
+	show_docs(options, docs)
+
+	#  add support also for delay before login which is very useful for 2-node clusters
+	if options["--action"] in ["off", "reboot"]:
+                time.sleep(int(options["--delay"]))
+
+	##
+	## Operate the fencing device
+	## We can not use fence_login(), username and passwd are sent on one line
+	####
+	try:
+		conn = fspawn(options, TELNET_PATH)
+		conn.send("set binary\n")
+		conn.send("open %s -%s\n"%(options["--ip"], options["--ipport"]))
+		screen = conn.read_nonblocking(size=100, timeout=int(options["--shell-timeout"]))
+		conn.log_expect(options, "Login.*", int(options["--shell-timeout"]))
+		conn.send_eol("%s" % (options["--username"]))
+		conn.log_expect(options, "Password.*", int(options["--shell-timeout"]))
+		conn.send_eol("%s" % (options["--password"]))
+		conn.log_expect(options, "clp.*", int(options["--shell-timeout"]))
+	except pexpect.EOF:
+		fail(EC_LOGIN_DENIED)
+	except pexpect.TIMEOUT:
+		fail(EC_LOGIN_DENIED)
+	result = fence_action(conn, options, set_power_status, get_power_status)
+
+	##
+	## Logout from system
+	##
+	## In some special unspecified cases it is possible that
+	## connection will be closed before we run close(). This is not
+	## a problem because everything is checked before.
+	######
+	try:
+		conn.send("exit\n")
+		conn.close()
+	except:
+		pass
+
+	sys.exit(result)
+
+if __name__ == "__main__":
+	main()