diff --git a/.gitignore b/.gitignore
index 465b487..8c540f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,3 +153,4 @@ systemtap-1.3.tar.gz
 /systemtap-2.9-0.20150707git320e1ec.tar.gz
 /systemtap-2.9-0.20150707git86f726b.tar.gz
 /systemtap-2.9-0.20150713git9d0b65f.tar.gz
+/systemtap-2.9.tar.gz
diff --git a/sources b/sources
index 2625f97..7f5d6ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-30a7ad17d25adbc06af6c8f873ce2813  systemtap-2.9-0.20150713git9d0b65f.tar.gz
+2f3c183966c82ec9d70c1de286b545fc  systemtap-2.9.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index 159808f..6ae89c3 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -58,7 +58,7 @@
 
 Name: systemtap
 Version: 2.9
-Release: 0.20150713git9d0b65f%{?dist}.1
+Release: 1%{?dist}
 # for version, see also configure.ac
 
 
@@ -91,7 +91,7 @@ Summary: Programmable system-wide instrumentation system
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Source: %{name}-%{version}-0.20150713git9d0b65f.tar.gz
+Source: ftp://sourceware.org/pub/systemtap/releases/systemtap-%{version}.tar.gz
 
 # Build*
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -773,14 +773,10 @@ exit 0
 
 %if %{with_java}
 
-%triggerin runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk
+%triggerin runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk
 for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
-    %ifarch %{ix86} ppc64 ppc64le
-        %ifarch ppc64 ppc64le
-            arch=ppc64
-	%else
-	    arch=i386
-	%endif
+    %ifarch %{ix86}
+	arch=i386
     %else
         arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
     %endif
@@ -792,14 +788,10 @@ for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
     done
 done
 
-%triggerun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk
+%triggerun runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk
 for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
-    %ifarch %{ix86} ppc64 ppc64le
-        %ifarch ppc64 ppc64le
-            arch=ppc64
-	%else
-	    arch=i386
-	%endif
+    %ifarch %{ix86}
+	arch=i386
     %else
         arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
     %endif
@@ -809,15 +801,11 @@ for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
     done
 done
 
-%triggerpostun runtime-java -- java-1.7.0-openjdk, java-1.6.0-openjdk
+%triggerpostun runtime-java -- java-1.8.0-openjdk, java-1.7.0-openjdk, java-1.6.0-openjdk
 # Restore links for any JDKs remaining after a package removal:
 for f in %{_libexecdir}/systemtap/libHelperSDT_*.so; do
-    %ifarch %{ix86} ppc64 ppc64le
-        %ifarch ppc64 ppc64le
-            arch=ppc64
-	%else
-	    arch=i386
-	%endif
+    %ifarch %{ix86}
+	arch=i386
     %else
         arch=`basename $f | cut -f2 -d_ | cut -f1 -d.`
     %endif
@@ -1030,20 +1018,8 @@ done
 #   http://sourceware.org/systemtap/wiki/SystemTapReleases
 
 %changelog
-* Sat Sep 05 2015 Kalev Lember <klember@redhat.com> - 2.9-0.20150713git9d0b65f.1
-- Rebuilt for librpm soname bump
-
-* Mon Jul 13 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150713git9d0b65f
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Tue Jul 07 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150707git86f726b
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
-
-* Tue Jul 07 2015 Lukas Berk <lberk@redhat.com> - 2.9-0.20150707git320e1ec
-- Automated weekly rawhide release
-- Applied spec changes from upstream git
+* Thu Oct 08 2015 Frank Ch. Eigler <fche@redhat.com> - 2.9-1
+- Upstream release.
 
 * Wed Jun 17 2015 Abegail Jakop <ajakop@redhat.com> - 2.8-1
 - Upstream release.