diff --git a/libsvm-2.84-5.patch b/libsvm-2.84-6.patch
similarity index 93%
rename from libsvm-2.84-5.patch
rename to libsvm-2.84-6.patch
index be92108..5da7e64 100644
--- a/libsvm-2.84-5.patch
+++ b/libsvm-2.84-6.patch
@@ -1,6 +1,6 @@
 diff -up ./Makefile.orig ./Makefile
 --- ./Makefile.orig	2007-09-25 10:07:29.000000000 +1000
-+++ ./Makefile	2007-09-25 14:30:10.000000000 +1000
++++ ./Makefile	2007-09-26 17:07:55.000000000 +1000
 @@ -1,8 +1,39 @@
  CXXC = g++
  CFLAGS = -Wall -O3 
@@ -42,7 +42,7 @@ diff -up ./Makefile.orig ./Makefile
  svm-predict: svm-predict.c svm.o
  	$(CXXC) $(CFLAGS) svm-predict.c svm.o -o svm-predict -lm
  svm-train: svm-train.c svm.o
-@@ -11,5 +42,53 @@ svm-scale: svm-scale.c
+@@ -11,5 +42,57 @@ svm-scale: svm-scale.c
  	$(CXXC) $(CFLAGS) svm-scale.c -o svm-scale
  svm.o: svm.cpp svm.h
  	$(CXXC) $(CFLAGS) -c svm.cpp
@@ -64,13 +64,17 @@ diff -up ./Makefile.orig ./Makefile
 +	install -m 644 svm.o ${LIB_INSTDIR}/libsvm
 +	mkdir -p ${INSTDIR}/include/libsvm
 +	install -m 644 svm.h ${INSTDIR}/include/libsvm
-+	mkdir -p ${INSTDIR}/share/libsvm/src
++	mkdir -p ${INSTDIR}/share/libsvm/src/java/libsvm
 +	install -m 644 *.h ${INSTDIR}/share/libsvm/src
 +	install -m 644 *.c ${INSTDIR}/share/libsvm/src
 +	install -m 644 *.cpp ${INSTDIR}/share/libsvm/src
 +	install -m 644 Makefile ${INSTDIR}/share/libsvm/src
-+	cp -R java ${INSTDIR}/share/libsvm/src
-+	cp -R svm-toy ${INSTDIR}/share/libsvm/src
++	install -m 644 java/*.java ${INSTDIR}/share/libsvm/src/java
++	install -m 644 java/Makefile ${INSTDIR}/share/libsvm/src/java
++	install -m 644 java/libsvm/*.java ${INSTDIR}/share/libsvm/src/java/libsvm
++	install -m 644 java/libsvm/*.m4 ${INSTDIR}/share/libsvm/src/java/libsvm
++#	cp -R java ${INSTDIR}/share/libsvm/src
++#	cp -R svm-toy ${INSTDIR}/share/libsvm/src
 +#	cp -R tools ${INSTDIR}/share/libsvm/src
 +#	cp -R windows ${INSTDIR}/share/libsvm/src
 +	mkdir -p ${INSTDIR}/share/libsvm/examples
diff --git a/libsvm.spec b/libsvm.spec
index 50ef755..322e89f 100644
--- a/libsvm.spec
+++ b/libsvm.spec
@@ -1,6 +1,6 @@
 Name:           libsvm
 Version:        2.84
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Library for Support Vector Machines
 
 Group:          Development/Libraries
@@ -10,7 +10,7 @@ Source0:        %{name}-%{version}.tar.gz
 #Source0:        http://www.csie.ntu.edu.tw/~cjlin/cgi-bin/libsvm.cgi?+http://www.csie.ntu.edu.tw/~cjlin/%{name}+tar.gz
 Source1:        ChangeLog
 #Source1:       http://www.csie.ntu.edu.tw/~cjlin/libsvm/log
-Patch0:         libsvm-2.84-5.patch
+Patch0:         libsvm-2.84-6.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  glibc-devel dos2unix
@@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT LIBDIR=%{_libdir}
 
 
+
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,25 +92,34 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/svm-scale
 %{_bindir}/svm-train
 %{_datadir}/libsvm/examples
+%{_libdir}/libsvm/libsvm.so
+%{_libdir}/libsvm/libsvm.so.2.84
 
 %files devel
+%defattr(-,root,root,-)
 %doc README
 %{_libdir}/libsvm
 %{_includedir}/libsvm
 %{_datadir}/libsvm/src
 
 %files python
+%defattr(-,root,root,-)
 %doc python/README-Python tools/README-Tools
 %{libsvm_python_dir}
 
 %files java
+%defattr(-,root,root,-)
 %doc java/README-Java
 #%{_libdir}/java/libsvm/docs
 %{_libdir}/java/libsvm/libsvm.jar
 %{_libdir}/java/libsvm/test_applet.html
 
 %changelog
-* Thu Aug 30 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-5
+* Thu Sep 26 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-6
+- Add defattr to each subpackage
+- Move libsvm.so to libsvm
+
+* Thu Sep 24 2007 Ding-Yi Chen <dchen@redhat.com> - 2.84-5
 - Split out libsvm-java
 - Add libsvm.so