--- a/cmd.avv.in	Tue May 03 14:36:07 2011 +0300
+++ b/cmd.avv.in	Sat May 07 15:04:57 2011 +0300
@@ -3,8 +3,9 @@
 Method:      glib
 Version:     ${PROJECT_VERSION}
 Description: ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}
-Requires:    modules:2 + commands:3 + logprint:3 + settings:1 + utils:2 +
-             xmpp:4 + hbuf:1 + hooks:4 + roster:3
+Requires:    utils:2 + ( commands:4 | commands:3 ) + ( roster:4 | roster:3 | roster:2 | roster:1 ) +
+             ( hooks:5 | hooks:4 | hooks:3 | hooks:2 | hooks:1 ) + logprint:3 + settings:1 +
+	     ( xmpp:4 | xmpp:3 | xmpp:2 | xmpp:1 )
 Init:        mcmd_init
 Uninit:      mcmd_uninit