diff --git a/etemplate/inc/class.boetemplate.inc.php b/etemplate/inc/class.boetemplate.inc.php
index 9574047664..732e1ffbb9 100644
--- a/etemplate/inc/class.boetemplate.inc.php
+++ b/etemplate/inc/class.boetemplate.inc.php
@@ -12,7 +12,7 @@
 
 	/* $Id$ */
 
-	include(PHPGW_API_INC . '/../../etemplate/inc/class.soetemplate.inc.php');
+	include_once(PHPGW_INCLUDE_ROOT . '/etemplate/inc/class.soetemplate.inc.php');
 
 	/*!
 	@class boetemplate
diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 7249f49f32..262b1eace9 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -17,4 +17,4 @@
 	{
 		$ui = '_gtk';
 	}
-	include(PHPGW_API_INC . "/../../etemplate/inc/class.uietemplate$ui.inc.php");
+	include_once(PHPGW_INCLUDE_ROOT . "/etemplate/inc/class.uietemplate$ui.inc.php");
diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php
index b6af7331af..9948e3cd96 100644
--- a/etemplate/inc/class.uietemplate.inc.php
+++ b/etemplate/inc/class.uietemplate.inc.php
@@ -12,7 +12,7 @@
 
 	/* $Id$ */
 
-	include(PHPGW_API_INC . '/../../etemplate/inc/class.boetemplate.inc.php');
+	include_once(PHPGW_INCLUDE_ROOT . '/etemplate/inc/class.boetemplate.inc.php');
 
 	/*!
 	@class etemplate
diff --git a/etemplate/inc/class.uietemplate_gtk.inc.php b/etemplate/inc/class.uietemplate_gtk.inc.php
index bd1cf84d61..a25d691441 100644
--- a/etemplate/inc/class.uietemplate_gtk.inc.php
+++ b/etemplate/inc/class.uietemplate_gtk.inc.php
@@ -12,7 +12,7 @@
 
 	/* $Id$ */
 
-	include(PHPGW_API_INC . '/../../etemplate/inc/class.boetemplate.inc.php');
+	include_once(PHPGW_INCLUDE_ROOT . '/etemplate/inc/class.boetemplate.inc.php');
 
 	/*!
 	@class etemplate
diff --git a/infolog/setup/setup.inc.php b/infolog/setup/setup.inc.php
index 4b4f9b3b30..0ab56acd71 100755
--- a/infolog/setup/setup.inc.php
+++ b/infolog/setup/setup.inc.php
@@ -39,4 +39,8 @@
 		 'appname' => 'phpgwapi',
 		 'versions' => Array('0.9.13', '0.9.14','0.9.15')
 	);
+	$setup_info['infolog']['depends'][] = array(
+		 'appname' => 'etemplate',
+		 'versions' => Array('0.9.13', '0.9.14','0.9.15')
+	);
 ?>