diff --git a/cfengine-2.2.1-overflow.diff b/cfengine-2.2.1-overflow.diff
deleted file mode 100644
index 6d718a6..0000000
--- a/cfengine-2.2.1-overflow.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/cf.defs.h
-+++ src/cf.defs.h
-@@ -431,7 +431,7 @@
- /*****************************************************************************/
- 
- #define CF_GRAINS   64
--#define ATTR     11
-+#define ATTR    20 
- #define CF_NETATTR   7 /* icmp udp dns tcpsyn tcpfin tcpack */
- #define PH_LIMIT 10
- #define CF_WEEK   (7.0*24.0*3600.0)
---- src/instrument.c
-+++ src/instrument.c
-@@ -244,7 +244,7 @@
-   DB_ENV *dbenv = NULL;
-   int ret, secs = CF_TICKS_PER_HOUR*hours, criterion, overdue;
-   time_t now = time(NULL),lsea = -1, tthen, then;
--  char name[CF_BUFSIZE],hostname[CF_BUFSIZE],datebuf[CF_MAXVARSIZE];
-+  char name[CF_BUFSIZE],hostname[CF_BUFSIZE],datebuf[CF_BUFSIZE];
-   char addr[CF_BUFSIZE],type[CF_BUFSIZE];
-   struct QPoint entry;
-   double average = 0.0, var = 0.0, ticksperminute = 60.0;
diff --git a/cfengine-2.2.1-uninitialized.diff b/cfengine-2.2.1-uninitialized.diff
deleted file mode 100644
index 205b1de..0000000
--- a/cfengine-2.2.1-uninitialized.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/scli.c
-+++ src/scli.c
-@@ -58,6 +58,8 @@
-    }
- 
- 
-+ptr=VSCLI;
-+
- if (!GetLock(ASUniqueName("scli"),CF_SCLI_COMM,ptr->ifelapsed,ptr->expireafter,VUQNAME,CFSTARTTIME))
-    {
-    ptr->done = 'y';
diff --git a/cfengine-2.2.1.tar.bz2 b/cfengine-2.2.1.tar.bz2
deleted file mode 100644
index 962e482..0000000
--- a/cfengine-2.2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c123bb04b6109f223518e6813c8dc4e5eb68f20b0f9f5108765aa4c27d4ec257
-size 3203512
diff --git a/cfengine-2.2.1-automake.dif b/cfengine-2.2.2-automake.dif
similarity index 100%
rename from cfengine-2.2.1-automake.dif
rename to cfengine-2.2.2-automake.dif
diff --git a/cfengine-2.2.1-chflags.dif b/cfengine-2.2.2-chflags.dif
similarity index 58%
rename from cfengine-2.2.1-chflags.dif
rename to cfengine-2.2.2-chflags.dif
index a4afa62..ac7e07c 100644
--- a/cfengine-2.2.1-chflags.dif
+++ b/cfengine-2.2.2-chflags.dif
@@ -1,15 +1,15 @@
 --- src/filedir.c
 +++ src/filedir.c
-@@ -126,7 +126,7 @@
-   int amroot = true, fixmode = true, docompress=false;
-   unsigned char digest[EVP_MAX_MD_SIZE+1];
+@@ -127,7 +127,7 @@
+   unsigned char digest1[EVP_MAX_MD_SIZE+1];
+   unsigned char digest2[EVP_MAX_MD_SIZE+1];
  
 -#if defined HAVE_CHFLAGS
 +#if defined HAVE_CHFLAGS && ! defined __linux__
    u_long newflags;
  #endif
  
-@@ -146,7 +146,7 @@
+@@ -149,7 +149,7 @@
    
  Debug("%s: Checking fs-object %s\n",VPREFIX,file);
  
@@ -17,17 +17,17 @@
 +#if defined HAVE_CHFLAGS && ! defined __linux__
  if (ptr != NULL)
     {
-    Debug("CheckExistingFile(+%o,-%o,+%o,-%o)\n",plus,minus,ptr->plus_flags,ptr->minus_flags);
-@@ -380,7 +380,7 @@
+    Debug("CheckExistingFile(+%o,-%o,+%o,-%o)\n",ptr->plus,ptr->minus,ptr->plus_flags,ptr->minus_flags);
+@@ -409,7 +409,7 @@
        }
     }
  
 -#ifndef HAVE_CHFLAGS
-+#if ! defined HAVE_CHFLAGS || defined __linux__
- if (((newperm & 07777) == (dstat->st_mode & 07777)) && (action != touch))    /* file okay */
++#if ! defined HAVE_CHFLAGS || defined __linux__ 
+ if (((newperm & 07777) == (dstat->st_mode & 07777)) && (ptr->action != touch))    /* file okay */
     {
     Debug("File okay, newperm = %o, stat = %o\n",(newperm & 07777),(dstat->st_mode & 07777));
-@@ -529,7 +529,7 @@
+@@ -564,7 +564,7 @@
     }
   
   
diff --git a/cfengine-2.2.1-ia64.dif b/cfengine-2.2.2-ia64.dif
similarity index 100%
rename from cfengine-2.2.1-ia64.dif
rename to cfengine-2.2.2-ia64.dif
diff --git a/cfengine-2.2.2-overflow.diff b/cfengine-2.2.2-overflow.diff
new file mode 100644
index 0000000..6729eb5
--- /dev/null
+++ b/cfengine-2.2.2-overflow.diff
@@ -0,0 +1,22 @@
+--- src/cf.defs.h
++++ src/cf.defs.h
+@@ -457,7 +457,7 @@
+ /*****************************************************************************/
+ 
+ #define CF_GRAINS   64
+-#define ATTR     11
++#define ATTR    20 
+ #define CF_NETATTR   7 /* icmp udp dns tcpsyn tcpfin tcpack */
+ #define PH_LIMIT 10
+ #define CF_WEEK   (7.0*24.0*3600.0)
+--- src/instrument.c
++++ src/instrument.c
+@@ -523,7 +523,7 @@
+    
+    tthen = (time_t)then;
+ 
+-   snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime(&tthen));
++   snprintf(datebuf,sizeof(datebuf),"%s",ctime(&tthen));
+    datebuf[strlen(datebuf)-9] = '\0';                     /* Chop off second and year */
+ 
+    snprintf(addr,15,"%s",hostname+1);
diff --git a/cfengine-2.2.1-printf.diff b/cfengine-2.2.2-printf.diff
similarity index 100%
rename from cfengine-2.2.1-printf.diff
rename to cfengine-2.2.2-printf.diff
diff --git a/cfengine-2.2.1-strict-aliasing-fix.diff b/cfengine-2.2.2-strict-aliasing-fix.diff
similarity index 100%
rename from cfengine-2.2.1-strict-aliasing-fix.diff
rename to cfengine-2.2.2-strict-aliasing-fix.diff
diff --git a/cfengine-2.2.2.tar.bz2 b/cfengine-2.2.2.tar.bz2
new file mode 100644
index 0000000..6212f83
--- /dev/null
+++ b/cfengine-2.2.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f349811785beb158ba5e1340289b89ebfa4b3a0b1bbea7cdffc5205f5cc6779
+size 3340487
diff --git a/cfengine.changes b/cfengine.changes
index 46585f6..05648b6 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Nov 21 14:54:35 CET 2007 - anicka@suse.cz
+
+- update to 2.2.2
+  * changes in build procedure, libtoolizing
+  * beginning of an integrated auditing system added
+  * SCLI interface modifications
+- fix init scripts (remove X-United-Linux headers, 
+  add dependency to $remote_fs) 
+
 -------------------------------------------------------------------
 Tue Jul  3 08:43:03 CEST 2007 - anicka@suse.cz
 
diff --git a/cfengine.spec b/cfengine.spec
index 6918a49..2e790d0 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package cfengine (Version 2.2.1)
+# spec file for package cfengine (Version 2.2.2)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -14,11 +14,11 @@ Name:           cfengine
 BuildRequires:  bison db-devel flex openssl-devel
 License:        GPL v2 or later
 Group:          Productivity/Networking/System
-Autoreqprov:    on
-Version:        2.2.1
-Release:        4
+AutoReqProv:    on
+Version:        2.2.2
+Release:        1
 Summary:        A Tool to Maintain Complicated Networks
-URL:            http://www.iu.hio.no/cfengine/
+Url:            http://www.cfengine.org/
 Source:         %{name}-%{version}.tar.bz2
 Source2:        cfenvd
 Source3:        cfexecd
@@ -29,7 +29,6 @@ Patch4:         %{name}-%{version}-automake.dif
 Patch5:         %{name}-%{version}-strict-aliasing-fix.diff
 Patch7:         %{name}-%{version}-printf.diff
 Patch9:         %{name}-%{version}-overflow.diff
-Patch10:        %{name}-%{version}-uninitialized.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %install_info_prereq
 
@@ -53,7 +52,6 @@ Authors:
 %patch5
 %patch7
 %patch9
-%patch10
 
 %build
 %{suse_update_config -f}
@@ -61,6 +59,7 @@ autoreconf -fi
 CC=gcc CFLAGS="$RPM_OPT_FLAGS" \
   ./configure --prefix=/usr \
 	      --with-docs \
+	      --libdir=%{_libdir} \
               --mandir=%{_mandir} \
               --infodir=%{_infodir} \
               --datadir=%{_defaultdocdir}
@@ -73,6 +72,7 @@ install -m 744 %{S:2} %{S:3} %{S:4} $RPM_BUILD_ROOT/etc/init.d/
 ln -sf ../../etc/init.d/cfenvd $RPM_BUILD_ROOT/%{_sbindir}/rccfenvd
 ln -sf ../../etc/init.d/cfexecd $RPM_BUILD_ROOT/%{_sbindir}/rccfexecd
 ln -sf ../../etc/init.d/cfservd $RPM_BUILD_ROOT/%{_sbindir}/rccfservd
+sed -i 's@-L/usr/src/packages/BUILD/cfengine-2.2.2/pub@@' $RPM_BUILD_ROOT/%{_libdir}/libcfengine.la 
 
 %clean
 [ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf  %{buildroot}
@@ -88,15 +88,27 @@ ln -sf ../../etc/init.d/cfservd $RPM_BUILD_ROOT/%{_sbindir}/rccfservd
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}-Tutorial.info.gz
 %insserv_cleanup
 
+%preun
+%stop_on_removal /etc/init.d/cfenvd
+%stop_on_removal /etc/init.d/cfservd
+%stop_on_removal /etc/init.d/cfexecd
+
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog NEWS README COPYING TODO inputs/*.example
 /usr/sbin/*
+%{_libdir}/*
 %doc %{_mandir}/man?/*
 %doc %{_infodir}/*.info*
 %attr(0755,root,root) %config /etc/init.d/*
-
 %changelog
+* Wed Nov 21 2007 - anicka@suse.cz
+- update to 2.2.2
+  * changes in build procedure, libtoolizing
+  * beginning of an integrated auditing system added
+  * SCLI interface modifications
+- fix init scripts (remove X-United-Linux headers,
+  add dependency to $remote_fs)
 * Tue Jul 03 2007 - anicka@suse.cz
 - add %%insserv_cleanup to %%postun
 * Tue Jun 12 2007 - anicka@suse.cz
diff --git a/cfenvd b/cfenvd
index cab3ed7..8e24c21 100644
--- a/cfenvd
+++ b/cfenvd
@@ -13,10 +13,10 @@
 #
 ### BEGIN INIT INFO
 # Provides:          cfenvd
-# Required-Start:    $local_fs
-# X-UnitedLinux-Should-Start:  $time sendmail
-# Required-Stop:     $local_fs
-# X-UnitedLinux-Should-Stop: $time sendmail
+# Required-Start:    $local_fs $remote_fs
+# Should-Start:  $time sendmail
+# Required-Stop:     $local_fs $emote_fs
+# Should-Stop: $time sendmail
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 6
 # Short-Description: cfenvd daemon for collecting random events
diff --git a/cfexecd b/cfexecd
index 940d8a5..095716d 100644
--- a/cfexecd
+++ b/cfexecd
@@ -13,10 +13,10 @@
 #
 ### BEGIN INIT INFO
 # Provides:          cfexecd
-# Required-Start:    $local_fs
-# X-UnitedLinux-Should-Start:  $time sendmail
-# Required-Stop:     $local_fs
-# X-UnitedLinux-Should-Stop: $time sendmail
+# Required-Start:    $local_fs $remote_fs
+# Should-Start:  $time sendmail
+# Required-Stop:     $local_fs $remote_fs
+# Should-Stop: $time sendmail
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 6
 # Short-Description: cfexecd daemon is a wrapper for local execution of cfagent
diff --git a/cfservd b/cfservd
index c943532..1b1d2c6 100644
--- a/cfservd
+++ b/cfservd
@@ -13,10 +13,10 @@
 #
 ### BEGIN INIT INFO
 # Provides:          cfservd
-# Required-Start:    $local_fs
-# X-UnitedLinux-Should-Start:  $time sendmail
-# Required-Stop:     $local_fs
-# X-UnitedLinux-Should-Stop: $time sendmail
+# Required-Start:    $local_fs $remote_fs
+# Should-Start:      $time sendmail
+# Required-Stop:     $local_fs $remote_fs 
+# Should-Stop: 	     $time sendmail
 # Default-Start:     3 5
 # Default-Stop:      0 1 2 6
 # Short-Description: cfservd daemon for starting cfengine remotely