--- a/CMakeLists.txt	Sat Dec 05 22:32:55 2009 +0200
+++ b/CMakeLists.txt	Fri Jan 15 12:07:50 2010 +0200
@@ -21,8 +21,7 @@
 add_library(templatecmd MODULE templatecmd.c) 
 
 ## User settable options
-set(MCABBER_INCLUDE_DIR "${templatecmd_SOURCE_DIR}/../include" 
-    CACHE FILEPATH "Path to mcabber headers") 
+set(MCABBER_INCLUDE_DIR "/usr/include" CACHE FILEPATH "Path to mcabber headers") 
  
 ## Packaging information
 set(CPACK_PACKAGE_NAME libmcabber-templatecmd)
@@ -51,12 +50,12 @@
 
 ## Compiler setup
 include_directories(SYSTEM ${GLIB_INCLUDE_DIRS} 
-                    ${GMODULE_INCLUDE_DIRS}) 
+                    ${GMODULE_INCLUDE_DIRS}
+                    ${MCABBER_INCLUDE_DIR})
 target_link_libraries(templatecmd ${GLIB_LIBRARIES} 
                       ${GMODULE_LIBRARIES}) 
 include_directories(${templatecmd_SOURCE_DIR} 
-                    ${templatecmd_BINARY_DIR} 
-                    ${MCABBER_INCLUDE_DIR}) 
+                    ${templatecmd_BINARY_DIR})
 
 ## Installation
 install(TARGETS templatecmd DESTINATION lib/mcabber) 

--- a/README	Sat Dec 05 22:32:55 2009 +0200
+++ b/README	Fri Jan 15 12:07:50 2010 +0200
@@ -21,7 +21,7 @@
 
 Debian users can instead of make install do
 $ fakeroot make package
-# dpkg -i ...-*.deb
+# dpkg -i libmcbaber-templatecmd*.deb
 
 Users of other distributions can select appropriate package
 generator, using cache editor.

--- a/templatecmd.c	Sat Dec 05 22:32:55 2009 +0200
+++ b/templatecmd.c	Fri Jan 15 12:07:50 2010 +0200
@@ -21,10 +21,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "compl.h"
-#include "commands.h"
-#include "utils.h"
-#include "logprint.h"
+#include <mcabber/compl.h>
+#include <mcabber/commands.h>
+#include <mcabber/utils.h>
+#include <mcabber/logprint.h>
 
 typedef struct {
 	gchar    *name;