--- a/CMakeLists.txt	Wed Nov 11 23:55:42 2009 +0200
+++ b/CMakeLists.txt	Fri Jan 15 09:16:59 2010 +0200
@@ -29,7 +29,7 @@
 set(CPACK_PACKAGE_VERSION "0.0.1")
 set(CPACK_PACKAGE_VENDOR "IsBear")
 set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber example modularized avatar implementation")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module for PEP avatar events handling")
 set(CPACK_RESOURCE_FILE_LICENSE ${avatar_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_GENERATOR TBZ2)
 set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
@@ -58,15 +58,15 @@
                     ${GMODULE_INCLUDE_DIRS} 
                     ${LM_INCLUDE_DIRS}
 					${PNG_INCLUDE_DIRS}
-					${AALIB_INCLUDE_DIRS}) 
+					${AALIB_INCLUDE_DIRS}
+                    ${MCABBER_INCLUDE_DIR})
 target_link_libraries(avatar ${GLIB_LIBRARIES} 
                       ${GMODULE_LIBRARIES}
 					  ${LM_LIBRARIES}
 					  ${PNG_LIBRARIES}
 					  ${AALIB_LIBRARIES})
 include_directories(${avatar_SOURCE_DIR} 
-                    ${avatar_BINARY_DIR} 
-                    ${MCABBER_INCLUDE_DIR}) 
+                    ${avatar_BINARY_DIR})
 
 ## Installation
 install(TARGETS avatar DESTINATION lib/mcabber) 

--- a/README	Wed Nov 11 23:55:42 2009 +0200
+++ b/README	Fri Jan 15 09:16:59 2010 +0200
@@ -52,7 +52,7 @@
 
 Debian users can instead of make install do
 $ fakeroot make package
-# dpkg -i ...-*.deb
+# dpkg -i libmcabber-avatar*.deb
 
 Users of other distributions can select appropriate package
 generator, using cache editor.

--- a/avatar.c	Wed Nov 11 23:55:42 2009 +0200
+++ b/avatar.c	Fri Jan 15 09:16:59 2010 +0200
@@ -34,15 +34,16 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "compl.h"
-#include "commands.h"
-#include "utils.h"
-#include "xmpp.h"
-#include "screen.h"
-#include "hbuf.h"
-#include "hooks.h"
-#include "settings.h"
-#include "pep.h"
+#include <mcabber/compl.h>
+#include <mcabber/commands.h>
+#include <mcabber/utils.h>
+#include <mcabber/xmpp.h>
+#include <mcabber/screen.h>
+#include <mcabber/hbuf.h>
+#include <mcabber/hooks.h>
+#include <mcabber/settings.h>
+
+#include <mcabber/pep.h>
 
 #define NS_AVATAR_DATA            ( "urn:xmpp:avatar:data"            )
 #define NS_AVATAR_METADATA        ( "urn:xmpp:avatar:metadata"        )