diff --git a/.gitignore b/.gitignore
index 231efba..b6b9a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ javacc-4.1src.tar.gz
 javacc.jar
 javacc-5.0src.tar.gz
 /javacc-6.1.2-sources.jar
+/release_6_1_3.tar.gz
diff --git a/javacc.sh b/javacc.sh
deleted file mode 100755
index 5031f86..0000000
--- a/javacc.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# 
-# JavaCC script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find function library, aborting"
-  exit 1
-fi
-
-# Configuration
-MAIN_CLASS=javacc
-BASE_JARS="javacc.jar"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
diff --git a/javacc.spec b/javacc.spec
index d474635..1412ead 100644
--- a/javacc.spec
+++ b/javacc.spec
@@ -28,17 +28,16 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%global releasename release_%(tr . _ <<< %{version})
+
 Name:           javacc
-Version:        6.1.2
+Version:        6.1.3
 Release:        1%{?dist}
 Epoch:          0
 Summary:        A parser/scanner generator for java
 License:        BSD
-URL:            http://javacc.java.net/
-Source0:        https://java.net/projects/javacc/downloads/download/releases/Release%%20%{version}/javacc-%{version}-sources.jar
-Source1:        javacc.sh
-Source2:        jjdoc
-Source3:        jjtree
+URL:            http://javacc.org
+Source0:        https://github.com/javacc/javacc/archive/%{releasename}.tar.gz
 
 BuildRequires:  javapackages-local
 BuildRequires:  ant
@@ -74,14 +73,12 @@ Summary:        Javadoc for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{releasename}
 
 # Remove binary information in the source tar
 find . -name "*.jar" -delete
 find . -name "*.class" -delete
 
-rm -r src/main/generated-sources
-
 find ./examples -type f -exec sed -i 's/\r//' {} \;
 
 build-jar-repository -p bootstrap javacc
@@ -99,13 +96,15 @@ ant jar javadoc
 %install
 %mvn_install -J target/javadoc
 
-install -Dp -T -m 755 %{SOURCE1} %{buildroot}/%{_bindir}/javacc.sh
-install -Dp -T -m 755 %{SOURCE2} %{buildroot}/%{_bindir}/jjdoc
-install -Dp -T -m 755 %{SOURCE3} %{buildroot}/%{_bindir}/jjtree
+%jpackage_script javacc '' '' javacc javacc true
+ln -s %{_bindir}/javacc %{buildroot}%{_bindir}/javacc.sh
+%jpackage_script jjdoc '' '' javacc jjdoc true
+%jpackage_script jjtree '' '' javacc jjtree true
 
 %files -f .mfiles
 %license LICENSE
 %doc README
+%{_bindir}/javacc
 %{_bindir}/javacc.sh
 %{_bindir}/jjdoc
 %{_bindir}/jjtree
@@ -120,6 +119,11 @@ install -Dp -T -m 755 %{SOURCE3} %{buildroot}/%{_bindir}/jjtree
 %license LICENSE
 
 %changelog
+* Tue Sep 06 2016 Michael Simacek <msimacek@redhat.com> - 0:6.1.3-1
+- Update to upstream version 6.1.3
+- Use new upstream location
+- Generate scripts with jpackage_script
+
 * Tue Aug 23 2016 Michael Simacek <msimacek@redhat.com> - 0:6.1.2-1
 - Update to upstream version 6.1.2
 
diff --git a/jjdoc b/jjdoc
deleted file mode 100755
index f3b0b6d..0000000
--- a/jjdoc
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# JJDoc script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find function library, aborting"
-  exit 1
-fi
-
-# Configuration
-MAIN_CLASS=jjdoc
-BASE_JARS="javacc.jar"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
diff --git a/jjtree b/jjtree
deleted file mode 100755
index aaa4880..0000000
--- a/jjtree
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# JJTree script
-# JPackage Project <http://www.jpackage.org/>
-
-# Source functions library
-if [ -f /usr/share/java-utils/java-functions ] ; then 
-  . /usr/share/java-utils/java-functions
-else
-  echo "Can't find function library, aborting"
-  exit 1
-fi
-
-# Configuration
-MAIN_CLASS=jjtree
-BASE_JARS="javacc.jar"
-
-# Set parameters
-set_jvm
-set_classpath $BASE_JARS
-set_flags $BASE_FLAGS
-set_options $BASE_OPTIONS
-
-# Let's start
-run "$@"
diff --git a/sources b/sources
index b5c532b..6cb253f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a29fdd55ccb738dc07a489b80b74e062  javacc-6.1.2-sources.jar
+7a5247f6f3a5d98a60e449e06d7dd5fb  release_6_1_3.tar.gz