diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index 49aee73..0454f81 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Apr 15 12:46:03 UTC 2011 - i@coly.li
+
+- update ocfs2-tools to 1.8.0
+
 -------------------------------------------------------------------
 Thu Dec  2 08:09:49 UTC 2010 - i@coly.li
 
@@ -16,6 +21,12 @@ Wed Oct  6 05:39:20 UTC 2010 - i@coly.li
 - update ocfs2-tools to 1.6.3
 - remove gcc45-ftbfs-deb-565100.patch, the fix is in upstream now. 
 
+-------------------------------------------------------------------
+Wed Jul 28 21:35:46 PDT 2010 - mfasheh@novell.com
+ 
+- Make ocfs2-kmp a Recommend instead of a Requires. This allows easier
+  building of packages which in turn depend on ocfs2-tools.
+
 -------------------------------------------------------------------
 Wed Jun 30 14:12:48 UTC 2010 - i@coly.li
 
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index b8eb4aa..afc37d8 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -43,6 +43,10 @@ PreReq:         %insserv_prereq %fillup_prereq
 AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       libdlm openais
+%if %suse_version < 1120  
+# There's no separate kmp for openSUSE 11.2  
+Recommends:     ocfs2-kmp
+%endif
 
 %description
 OCFS is the Oracle Cluster File System.
@@ -129,7 +133,7 @@ Authors:
 export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
 export PROJECT="ocfs2-tools"
 autoreconf -fi -I /usr/share/aclocal
-%configure --disable-debug --prefix=/usr --mandir=%{_mandir} --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
+%configure --disable-debug --prefix=/usr --mandir=%{_mandir} --enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes
 make OPTS="$RPM_OPT_FLAGS"
 
 cd reflink
@@ -197,7 +201,9 @@ fi
 %{_sbindir}/o2image
 %{_sbindir}/debugfs.ocfs2
 %{_sbindir}/ocfs2_controld.pcmk
+%{_sbindir}/o2hbmonitor
 %{_bindir}/reflink
+%{_bindir}/o2info
 %config %{_sysconfdir}/udev/rules.d/51-ocfs2.rules
 %{_mandir}/man8/debugfs.ocfs2.8*
 %{_mandir}/man8/fsck.ocfs2.8*
@@ -208,6 +214,7 @@ fi
 %{_mandir}/man8/ocfs2_hb_ctl.8*
 %{_mandir}/man8/mount.ocfs2.8*
 %{_mandir}/man8/o2image.8.gz
+%{_mandir}/man1/o2info.1.gz
 %doc COPYING CREDITS MAINTAINERS
 %doc documentation/users_guide.txt
 %dir /usr/lib/ocf
@@ -226,11 +233,13 @@ fi
 /sbin/rco2cb
 /sbin/rcocfs2
 /sbin/o2cb_ctl
+/sbin/o2cb
 %{_sysconfdir}/init.d/o2cb
 %{_sysconfdir}/init.d/ocfs2
 %{_mandir}/man8/o2cb_ctl.8*
 /var/adm/fillup-templates/sysconfig.o2cb
 %{_mandir}/man7/o2cb.7.gz
+%{_mandir}/man8/o2cb.8.gz
 %doc README.O2CB 
 
 %files devel
diff --git a/ocfs2-tools.tar.bz2 b/ocfs2-tools.tar.bz2
index 9364607..0ec0c00 100644
--- a/ocfs2-tools.tar.bz2
+++ b/ocfs2-tools.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9914ed380cf0409689c06c691177d437a5615ffbb39d8083b414e2d499ac467
-size 1238521
+oid sha256:98bb639816d4ff6e0e77185d1aa860baca073de8e7cedd59e3db19d2c97d9636
+size 1263265