diff --git a/oprofile-0.9.4.diff b/oprofile-0.9.4.diff
index 3fdce05..1b703e0 100644
--- a/oprofile-0.9.4.diff
+++ b/oprofile-0.9.4.diff
@@ -8,6 +8,17 @@
  ACLOCAL_AMFLAGS = -I m4
  
  # The module will not build under distcheck
+--- agents/jvmpi/Makefile.am
++++ agents/jvmpi/Makefile.am
+@@ -1,6 +1,6 @@
+-pkglib_LTLIBRARIES = libjvmpi_oprofile.la
++lib_LTLIBRARIES = libjvmpi_oprofile.la
+ 
+-libjvmpi_oprofile_la_CXXFLAGS = -W -Wall -fPIC
++libjvmpi_oprofile_la_LDFLAGS = -module -avoid-version
+ 
+ libjvmpi_oprofile_la_SOURCES = jvmpi_oprofile.cpp
+ 
 --- agents/jvmpi/jvmpi_oprofile.cpp
 +++ agents/jvmpi/jvmpi_oprofile.cpp
 @@ -16,6 +16,7 @@
@@ -18,6 +29,19 @@
  
  extern "C" {
  #include <jvmpi.h>
+--- agents/jvmti/Makefile.am
++++ agents/jvmti/Makefile.am
+@@ -1,8 +1,8 @@
+ AM_CFLAGS = @OP_CFLAGS@
+ 
+-pkglib_LTLIBRARIES = libjvmti_oprofile.la
++lib_LTLIBRARIES = libjvmti_oprofile.la
+ 
+-libjvmti_oprofile_la_CFLAGS = $(AM_CFLAGS) -fPIC
++libjvmti_oprofile_la_LDFLAGS = -module -avoid-version
+ 
+ libjvmti_oprofile_la_LIBADD = ../../libopagent/libopagent.la
+ 
 --- configure.in
 +++ configure.in
 @@ -140,7 +140,7 @@ AX_CHECK_DOCBOOK
@@ -29,6 +53,23 @@
  POPT_LIBS="-lpopt"
  AC_SUBST(LIBERTY_LIBS)
  AC_SUBST(BFD_LIBS)
+--- libopagent/Makefile.am
++++ libopagent/Makefile.am
+@@ -1,4 +1,4 @@
+-pkglib_LTLIBRARIES = libopagent.la
++lib_LTLIBRARIES = libopagent.la
+ 
+ # install opagent.h to include directory
+ include_HEADERS = opagent.h
+@@ -10,7 +10,7 @@ libopagent_la_SOURCES = opagent.c \
+ EXTRA_DIST = opagent_symbols.ver
+ 
+ 
+-libopagent_la_CFLAGS = -fPIC -I ${top_srcdir}/libop -I ${top_srcdir}/libutil
++libopagent_la_CPPFLAGS = -I ${top_srcdir}/libop -I ${top_srcdir}/libutil
+ libopagent_la_LIBADD = $(BFD_LIBS)
+ 
+ # Do not increment the major version for this library except to
 --- libutil++/file_manip.cpp
 +++ libutil++/file_manip.cpp
 @@ -44,7 +44,7 @@ bool copy_file(string const & source, st
diff --git a/oprofile.changes b/oprofile.changes
index 4501b42..53059ee 100644
--- a/oprofile.changes
+++ b/oprofile.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 21 15:27:26 CEST 2008 - schwab@suse.de
+
+- Fix jvm agent libs.
+
 -------------------------------------------------------------------
 Fri Jul 18 13:43:33 CEST 2008 - schwab@suse.de
 
diff --git a/oprofile.spec b/oprofile.spec
index 4a78cf5..8d21038 100644
--- a/oprofile.spec
+++ b/oprofile.spec
@@ -2,9 +2,16 @@
 # spec file for package oprofile (Version 0.9.4)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -18,7 +25,7 @@ Group:          Development/Tools/Other
 AutoReqProv:    on
 PreReq:         /usr/sbin/groupadd /usr/sbin/useradd
 Version:        0.9.4
-Release:        1
+Release:        46
 Summary:        System-Wide Profiler for Linux Systems
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         %{name}-%{version}.tar.gz
@@ -81,8 +88,8 @@ OProfile is currently in alpha status; however it has proven stable
 over a large number of differing configurations. As always, there is no
 warranty.
 
-This is the package containing the files to develop JIT agents for
-other virtual machines.
+This package contains the files needed to develop JIT agents for other
+virtual machines.
 
 
 
@@ -113,6 +120,10 @@ make DESTDIR=$RPM_BUILD_ROOT htmldir=%{_docdir}/oprofile install
 /usr/sbin/groupadd -r oprofile 2>/dev/null || :
 /usr/sbin/useradd -r -g oprofile -d /var/lib/empty -s /bin/false -c "Special user account to be used by OProfile" oprofile 2>/dev/null || :
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,8 +132,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/bin/*
 /usr/share/applications/*.desktop
 /usr/share/oprofile
-%dir %{_libdir}/oprofile
-%{_libdir}/oprofile/*.so.*
+%{_libdir}/*.so*
+%exclude %{_libdir}/libopagent.so
 %{_mandir}/man1/*
 %doc doc/oprofile.html doc/internals.html doc/opreport.xsd
 %doc COPYING README TODO ChangeLog 
@@ -131,11 +142,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /usr/include/*
 %doc doc/op-jit-devel.html 
-%dir %{_libdir}/oprofile
-%{_libdir}/oprofile/*.*a
-%{_libdir}/oprofile/*.so
+%{_libdir}/*.*a
+%{_libdir}/libopagent.so
 
 %changelog
+* Tue Oct 21 2008 schwab@suse.de
+- Fix jvm agent libs.
 * Fri Jul 18 2008 schwab@suse.de
 - Update to oprofile 0.9.4.
   http://oprofile.sourceforge.net/release-notes/oprofile-0.9.4