diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 6d58452..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: OpenIPMI
-# $Id$
-NAME := OpenIPMI
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/OpenIPMI.spec b/OpenIPMI.spec
index 5c0c4bd..c75ad60 100644
--- a/OpenIPMI.spec
+++ b/OpenIPMI.spec
@@ -4,7 +4,7 @@
 Summary: OpenIPMI (Intelligent Platform Management Interface) library and tools
 Name: OpenIPMI
 Version: 2.0.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: BSD and BSD with advertising and LGPLv2+ and GPLv2+
 Group: System Environment/Base
 URL: http://sourceforge.net/projects/openipmi/
@@ -14,7 +14,7 @@ Source2: openipmi.initscript
 Source3: openipmigui.desktop
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gdbm-devel swig glib2-devel net-snmp-devel ncurses-devel
-BuildRequires: openssl-devel python-devel perl-devel chrpath tcl-devel tkinter
+BuildRequires: openssl-devel python-devel perl-devel tcl-devel tkinter
 BuildRequires: desktop-file-utils
 Requires(post): chkconfig
 Requires(preun): chkconfig
@@ -73,20 +73,21 @@ and control IPMI-enabled devices.
 %build
 export CFLAGS=-fPIC
 %configure --with-pythoninstall=%{python_sitearch} --disable-dependency-tracking --with-tcl=no --disable-static
-sed -i 's|^sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/%{_lib} %{_libdir}|' libtool
-make # not %{?_smp_mflags} safe
+# get rid of rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make   # not %{?_smp_mflags} safe
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # Remove python cruft in 32bit libdir on 64bit archs...
 %ifarch ppc64 s390x x86_64
 rm -rf $RPM_BUILD_ROOT/usr/lib
 %endif
-# Remove rpaths from libOpenIPMIposix.so.0.0.1
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/libOpenIPMIposix.so.0.0.1
-# Remove static libraries
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig
 install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/ipmi
@@ -164,6 +165,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/fedora-openipmigui.desktop
 
 %changelog
+* Wed Dec 10 2008 Jan Safranek <jsafrane@redhat.com> - 2.0.14-7
+- shorter probe interval is used in init script, making the service startup
+  quicker in most situations (#475101)
+- fix linking without rpath, prelink won't screw up the libraries 
+  anymore (#475265)
+
 * Thu Oct 30 2008 Jan Safranek <jsafrane@redhat.com> - 2.0.14-6
 - removed static libraries from the -devel subpackage
 - fixed openipmigui.desktop file
diff --git a/openipmi.initscript b/openipmi.initscript
index 3bb49bf..3eda3f8 100644
--- a/openipmi.initscript
+++ b/openipmi.initscript
@@ -111,7 +111,7 @@ MODULES="${MODULES_INTERFACES} ${MODULES_FEATURES} ${MODULES_HW} ${MODULES_BASE}
 
 RETVAL=0
 LOCKFILE=/var/lock/subsys/ipmi
-DEV_IPMI_TIMEOUT=15
+DEV_IPMI_TIMEOUT=150
 
 UDEV_EXISTS=0
 if [ -e /sbin/udev -o -e /sbin/udevd ]; then
@@ -384,7 +384,7 @@ load_ipmi_modules ()
 			locdelay=${DEV_IPMI_TIMEOUT}
 			while [ ! -e /dev/ipmi${INTF_NUM} -a ${locdelay} -gt 0 ]; do
 				locdelay=$((locdelay - 1))
-				sleep 1
+				sleep 0.1
 			done
 		fi
 	fi