diff --git a/.gitignore b/.gitignore
index fe8884b..57795d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ msv-20050722.tar.gz
 /msv-parent-2009.1.pom
 /LICENSE-2.0.txt
 /msv-2013.5.1-clean.tar.gz
+/msv-2013.6.1-clean.tar.gz
diff --git a/msv.spec b/msv.spec
index b07c539..daca10b 100644
--- a/msv.spec
+++ b/msv.spec
@@ -1,7 +1,7 @@
 Name:          msv
 Epoch:         1
-Version:       2013.5.1
-Release:       7%{?dist}
+Version:       2013.6.1
+Release:       1%{?dist}
 Summary:       Multi-Schema Validator
 License:       BSD and ASL 1.1
 URL:           http://msv.java.net/
@@ -10,38 +10,29 @@ URL:           http://msv.java.net/
 # $ ./create-tarball
 Source0:       %{name}-%{version}-clean.tar.gz
 
-# Parent POM is no longer in svn, get it from Maven central repository
-Source1:       http://repo1.maven.org/maven2/net/java/dev/%{name}/%{name}-parent/2009.1/%{name}-parent-2009.1.pom
-
 Source2:       http://www.apache.org/licenses/LICENSE-2.0.txt
 Source3:       create-tarball.sh
 
 # Use CatalogResolver from xml-commons-resolver package
 Patch1:        %{name}-Use-CatalogResolver-class-from-xml-commons-resolver.patch
 
-BuildRequires: java-devel
-BuildRequires: java-javadoc
-BuildRequires: jpackage-utils
-BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-BuildRequires: maven-plugin-build-helper
-BuildRequires: isorelax
-BuildRequires: isorelax-javadoc
-BuildRequires: relaxngDatatype
-BuildRequires: relaxngDatatype-javadoc
-BuildRequires: xalan-j2
-BuildRequires: xerces-j2
-BuildRequires: junit
-BuildRequires: jvnet-parent
-BuildRequires: xml-commons-resolver
-BuildRequires: isorelax
+BuildRequires:  maven-local
+BuildRequires:  mvn(isorelax:isorelax)
+BuildRequires:  mvn(jdom:jdom)
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(net.java.dev.msv:msv-core)
+BuildRequires:  mvn(net.java.dev.msv:msv)
+BuildRequires:  mvn(net.java.dev.msv:msv-testharness)
+BuildRequires:  mvn(net.java.dev.msv:xsdlib)
+BuildRequires:  mvn(net.java:jvnet-parent)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires:  mvn(relaxngDatatype:relaxngDatatype)
+BuildRequires:  mvn(xerces:xercesImpl)
+BuildRequires:  mvn(xml-resolver:xml-resolver)
 
 BuildArch:     noarch
 
@@ -72,7 +63,7 @@ Summary:       Multi-Schema Validator RNG Converter
 %package       xmlgen
 Summary:       Multi-Schema Validator Generator
 
-%description    xmlgen
+%description   xmlgen
 %{summary}.
 
 %package       xsdlib
@@ -113,8 +104,6 @@ Requires:      msv-xsdlib
 # Needed becuase of patch3
 %pom_add_dep xml-resolver:xml-resolver
 
-cp %{SOURCE1} parent-pom.xml
-
 # ASL 2.0 license text
 cp %{SOURCE2} Apache-LICENSE-2.0.txt
 
@@ -133,10 +122,7 @@ done
 
 # Fix isorelax groupId
 %pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>"
-%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" generator
 %pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" msv
-%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" rngconverter
-%pom_xpath_replace "pom:dependency[pom:groupId[text()='com.sun.xml.bind.jaxb']]/pom:groupId" "<groupId>isorelax</groupId>" xsdlib
 
 # Change encoding of non utf-8 files
 for m in $(find . -name copyright.txt) ; do
@@ -160,10 +146,6 @@ done
 %install
 %mvn_install
 
-# parent POM
-install -pD -T -m 644 parent-pom.xml       %{buildroot}%{_mavenpomdir}/JPP-msv-parent.pom
-%add_maven_depmap JPP-%{name}-parent.pom
-
 # Manuals
 install -d -m 755 %{buildroot}%{_docdir}/%{name}/msv
 install -m 644 msv/doc/*.html     %{buildroot}%{_docdir}/%{name}/msv
@@ -211,8 +193,6 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib
 %files xsdlib -f .mfiles-xsdlib
 %doc msv/doc/Apache-LICENSE-1.1.txt
 %doc License.txt
-%{_mavenpomdir}/JPP-%{name}-parent.pom
-%{_mavendepmapfragdir}/msv
 
 %files javadoc -f .mfiles-javadoc
 %doc License.txt
@@ -227,6 +207,9 @@ cp -pr xsdlib/examples/* %{buildroot}%{_datadir}/%{name}/xsdlib
 %{_datadir}/%{name}
 
 %changelog
+* Mon Sep 23 2013 Michal Srb <msrb@redhat.com> - 1:2013.6.1-1
+- Update to upstream version 2013.6.1
+
 * Mon Sep 23 2013 Michal Srb <msrb@redhat.com> - 1:2013.5.1-7
 - Adapt to current guidelines
 
diff --git a/sources b/sources
index 3d0befc..b9273c4 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-23e80cb265daeed7dd357b4e891ba096  msv-parent-2009.1.pom
+a1fb4f939e291fe85711551cd7d36e33  msv-2013.6.1-clean.tar.gz
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-9a6a831c3e03c9f7872a656930e820c2  msv-2013.5.1-clean.tar.gz