diff --git a/msv.spec b/msv.spec
index a363f97..23b65eb 100644
--- a/msv.spec
+++ b/msv.spec
@@ -37,9 +37,9 @@
 Summary:        Multischema Validator
 Name:           msv
 Version:        1.2
-Release:        0.1.%{cvsdate}.3jpp.1%{?dist}
+Release:        0.1.%{cvsdate}.3jpp.2%{?dist}
 Epoch:          1
-License:        BSD-Style
+License:        BSD
 URL:            http://msv.dev.java.net
 Group:          Development/Libraries
 # cvs -d :pserver:guest@cvs.dev.java.net:/cvs export -r msv-20050722 msv ; mv msv msv-20050722 tar zcf msv-20050722.tar.gz msv-*
@@ -238,6 +238,20 @@ cp tempf $m
 done
 rm tempf
 
+#change encoding of non utf-8 files
+iconv msv/doc/copyright.txt -f iso-8859-1 -t utf-8 -o msv/doc/copyright.txt.utf8
+mv msv/doc/copyright.txt.utf8 msv/doc/copyright.txt
+iconv relames/doc/copyright.txt -f iso-8859-1 -t utf-8 -o relames/doc/copyright.txt.utf8
+mv relames/doc/copyright.txt.utf8 relames/doc/copyright.txt
+iconv rngconverter/doc/copyright.txt -f iso-8859-1 -t utf-8 -o rngconverter/doc/copyright.txt.utf8
+mv rngconverter/doc/copyright.txt.utf8 rngconverter/doc/copyright.txt
+iconv generator/doc/copyright.txt -f iso-8859-1 -t utf-8 -o generator/doc/copyright.txt.utf8
+mv generator/doc/copyright.txt.utf8 generator/doc/copyright.txt
+iconv xsdlib/doc/copyright.txt -f iso-8859-1 -t utf-8 -o xsdlib/doc/copyright.txt.utf8
+mv xsdlib/doc/copyright.txt.utf8 xsdlib/doc/copyright.txt
+
+
+
 %patch0 -b .sav
 %patch1 -b .sav2
 %patch2
@@ -358,6 +372,8 @@ fi
 %{_javadir}/%{name}-msv-%{version}.jar
 %{_javadir}/%{name}-msv.jar
 %{_javadir}/msv-strict.jar
+%dir %doc %{_docdir}/%{name}
+%dir %doc %{_docdir}/%{name}/msv
 %doc %{_docdir}/%{name}/msv/license.txt
 %doc %{_docdir}/%{name}/msv/copyright.txt
 %if %{gcj_support}
@@ -367,10 +383,12 @@ fi
 
 %files msv-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/msv
 
 %files demo
 %defattr(0644,root,root,0755)
+%dir %{_datadir}/%{name}-%{version}
 %{_datadir}/%{name}-%{version}/msv
 %{_datadir}/%{name}-%{version}/xsdlib
 
@@ -378,7 +396,8 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-relames-%{version}.jar
 %{_javadir}/%{name}-relames.jar
-#%{_docdir}/%{name}/relames/license.txt
+##%{_docdir}/%{name}/relames/license.txt
+%dir %doc %{_docdir}/%{name}/relames
 %doc %{_docdir}/%{name}/relames/copyright.txt
 %if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-relames*
@@ -386,12 +405,14 @@ fi
 
 %files relames-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/relames
 
 %files rngconv
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-rngconv-%{version}.jar
 %{_javadir}/%{name}-rngconv.jar
+%dir %doc %{_docdir}/%{name}/rngconv
 %doc %{_docdir}/%{name}/rngconv/license.txt
 %doc %{_docdir}/%{name}/rngconv/copyright.txt
 %if %{gcj_support}
@@ -402,6 +423,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-xmlgen-%{version}.jar
 %{_javadir}/%{name}-xmlgen.jar
+%dir %doc %{_docdir}/%{name}/xmlgen
 %doc %{_docdir}/%{name}/xmlgen/license.txt
 %doc %{_docdir}/%{name}/xmlgen/copyright.txt
 %if %{gcj_support}
@@ -410,6 +432,7 @@ fi
 
 %files xmlgen-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/xmlgen
 
 %files xsdlib
@@ -417,6 +440,7 @@ fi
 %{_javadir}/%{name}-xsdlib-%{version}.jar
 %{_javadir}/%{name}-xsdlib.jar
 %{_javadir}/xsdlib.jar
+%dir %doc %{_docdir}/%{name}/xsdlib
 %doc %{_docdir}/%{name}/xsdlib/license.txt
 %doc %{_docdir}/%{name}/xsdlib/copyright.txt
 %if %{gcj_support}
@@ -425,23 +449,35 @@ fi
 
 %files xsdlib-javadoc
 %defattr(0644,root,root,0755)
+%dir %doc %{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}/xsdlib
 
 %files manual
 %defattr(0644,root,root,0755)
+%dir %doc %{_docdir}/%{name}
+%dir %doc %{_docdir}/%{name}/msv
 %doc %{_docdir}/%{name}/msv/ChangeLog.txt
 %doc %{_docdir}/%{name}/msv/*.html
 %doc %{_docdir}/%{name}/msv/*.gif
 %doc %{_docdir}/%{name}/msv/README.txt
+%dir %doc %{_docdir}/%{name}/relames
 %doc %{_docdir}/%{name}/relames/README.txt
+%dir %doc %{_docdir}/%{name}/rngconv
 %doc %{_docdir}/%{name}/rngconv/README.txt
+%dir %doc %{_docdir}/%{name}/xmlgen
 %doc %{_docdir}/%{name}/xmlgen/*.html
 %doc %{_docdir}/%{name}/xmlgen/README.txt
+%dir %doc %{_docdir}/%{name}/xsdlib
 %doc %{_docdir}/%{name}/xsdlib/*.html
 %doc %{_docdir}/%{name}/xsdlib/README.txt
 
 
 %changelog
+* Tue Sep 11 2007 Matt Wringe <mwringe@redhat.com> 0:1.2-0.1.20050722.3jpp.2
+- Fix unowned directories
+- Change copyright files to utf-8 format
+- Change license field to BSD (from BSD-Style)
+
 * Fri Feb 16 2007 Andrew Overholt <overholt@redhat.com> 0:1.2-0.1.20050722.3jpp.1
 - Remove postun Requires on jpackage-utils
 - Set gcj_support to 1