diff -Nuar openhpi-2.10.1/Makefile.am openhpi-2.10.1/Makefile.am
--- openhpi-2.10.1/Makefile.am	
+++ openhpi-2.10.1/Makefile.am	
@@ -98,7 +98,7 @@
                   $(top_srcdir)/utils/el_utils.h
 
 docsdir=$(datadir)/doc/$(PACKAGE_NAME)-$(VERSION)
-docs_DATA = README README.daemon
+#docs_DATA = README README.daemon
 
 $(top_srcdir)/utils/sahpi_enum_utils.h:
 	make -C $(top_builddir)/utils sahpi_enum_utils.h
diff -Nuar openhpi-2.10.1/configure.ac openhpi-2.10.1/configure.ac
--- openhpi-2.10.1/configure.ac	
+++ openhpi-2.10.1/configure.ac	
@@ -506,6 +506,22 @@
     [AC_DEFINE([OH_DBG_MSGS],[1],[Enables dynamic debug messages])]
     )
 
+
+dnl This will let the user to decide whether he wants to use doc. 
+dnl Helpful while generating rpm in SUSE
+
+AC_ARG_ENABLE([doc],
+    [  --enable-doc            build openhpi documents  [[default=yes]]],
+    [if test "x$enableval" = "xyes"; then
+            AC_SUBST(WITH_DOC,1)
+    else
+            AC_SUBST(WITH_DOC,0)
+    fi],
+    [AC_SUBST(WITH_DOC,1)])
+
+
+
+
 dnl Now we throw in a bunch of warnings.  C and C++ need
 dnl different sets here
 
diff -Nuar openhpi-2.10.1/openhpi.spec.in openhpi-2.10.1/openhpi.spec.in
--- openhpi-2.10.1/openhpi.spec.in	
+++ openhpi-2.10.1/openhpi.spec.in	
@@ -11,6 +11,7 @@
 %define with_bladecenter @WITH_SNMP_BC@
 %define with_rtas @WITH_RTAS@
 %define with_sysfs @WITH_SYSFS@
+%define with_doc @WITH_DOC@
 
 
 Name: @HPI_PKG@
@@ -29,7 +30,10 @@
 Source: http://prdownloads.sourceforge.net/openhpi/%{name}-%{version}.tar.gz
 #
 Buildroot: %{_rpmtopdir}/INSTALL
-BuildRequires: pkgconfig glib2-devel automake autoconf libtool net-snmp-devel gcc-c++ docbook-utils docbook-utils-pdf
+BuildRequires: pkgconfig glib2-devel automake autoconf libtool net-snmp-devel gcc-c++
+%if 0%{?with_doc}
+BuildRequires: docbook-utils docbook-utils-pdf
+%endif
 %if 0%{?suse_version}
 BuildRequires: tcpd-devel
 %else
@@ -45,7 +49,7 @@
 %package clients
 Summary: OpenHPI command-line utilities
 Group: System/Monitoring
-BuildRequires: popt-devel
+#BuildRequires: popt-devel
 Requires: openhpi = %{version} popt
 
 %if 0%{?with_ipmi}
@@ -160,8 +164,10 @@
 ./configure @ac_configure_args@ --sysconfdir=/etc --prefix=/usr --libdir=/usr/lib --with-varpath=/var/lib/%{name}
 %endif
 %{__make}
+%if 0%{?with_doc}
 make -C docs/hld pdf-am
 make -C docs/hld openhpi-manual/book1.html
+%endif
 
 ###################################################
 %install
@@ -177,8 +183,10 @@
 ###################################################
 %defattr(-,root,root)
 %doc README README.daemon COPYING
+%if 0%{?with_doc}
 %doc docs/hld/*pdf
 %doc docs/hld/openhpi-manual
+%endif
 %dir %{_sysconfdir}/%{name}/
 %config(noreplace) %attr(0640,root,root) %{_sysconfdir}/%{name}/%{name}.conf
 %dir %{_libdir}/%{name}
@@ -186,6 +194,7 @@
 %{_libdir}/libopenhpi*.so.*
 %{_libdir}/liboh*connx*.so.*
 %{_mandir}/man7/%{name}.7*
+%{_mandir}/man8/openhpid.8*
 %{_sbindir}/openhpid
 %{_sysconfdir}/init.d/openhpid