diff --git a/_service b/_service
index 359ed24..5e4c2c2 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,9 @@
     <param name="package-meta">no</param>
     <param name="exclude">.git</param>
     <param name="filename">opa-fmgui</param>
-    <param name="version">10.1.0.0</param>
+    <param name="version">10.1.0.0.115</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionrewrite-replacement">\1</param>
     <param name="revision">814f72fc665e4143a25e3c685e784d2006898603</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/opa-fmgui-10.1.0.0.115.tar.gz b/opa-fmgui-10.1.0.0.115.tar.gz
new file mode 100644
index 0000000..8f5a358
--- /dev/null
+++ b/opa-fmgui-10.1.0.0.115.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cb93cbead0d4132f8376da0831fcc7e8ae25edf18297a5d9477e1229f8943768
+size 5975988
diff --git a/opa-fmgui-10.1.0.0.tar.gz b/opa-fmgui-10.1.0.0.tar.gz
deleted file mode 100644
index c5bc797..0000000
--- a/opa-fmgui-10.1.0.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c17ef61a7ebc2fffaa3cdce6261bb9be4394fea9f145507bc7395ba4a31c4ae
-size 5976945
diff --git a/opa-fmgui.changes b/opa-fmgui.changes
index 4a4aab1..c342247 100644
--- a/opa-fmgui.changes
+++ b/opa-fmgui.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Sep 10 23:38:22 UTC 2017 - jengelh@inai.de
+
+- Replace old $RPM_* shell vars by macros. Fix RPM group.
+
+-------------------------------------------------------------------
+Tue Sep  5 14:32:45 UTC 2017 - nmoreychaisemartin@suse.com
+
+- Update _service to allow auto updates from github
+
 -------------------------------------------------------------------
 Thu Jun  8 10:08:04 UTC 2017 - nmoreychaisemartin@suse.com
 
diff --git a/opa-fmgui.spec b/opa-fmgui.spec
index 18538da..7cb0355 100644
--- a/opa-fmgui.spec
+++ b/opa-fmgui.spec
@@ -17,6 +17,8 @@
 #
 
 
+%define git_ver %{nil}
+
 %define name opa-fmgui
 %define appdir .
 %define appfolder opa-fmgui
@@ -25,13 +27,13 @@
 %define gradle_version	2.9
 
 Name:           opa-fmgui
-Version:        10.1.0.0
+Version:        10.1.0.0.115
 Release:        0
 Summary:        Fabric Manager Graphical User Interface
 License:        BSD-3-Clause and LGPL-2.0+
-Group:          Applications/System
+Group:          Productivity/Clustering/Computing
 Url:            http://www.intel.com/
-Source0:        opa-fmgui-%{version}.tar.gz
+Source0:        %{name}-%{version}%{git_ver}.tar.gz
 Source1:        antlr-2.7.7.jar
 Source2:        dom4j-1.6.1.jar
 # Source3:        gritty.jar
@@ -95,15 +97,15 @@ FMGUI is the Fabric Manager Graphical User Interface.  It can be run by invoking
 script fmgui.
 
 %prep
-%setup -q -n opa-fmgui-%{version}
+%setup -q -n  %{name}-%{version}%{git_ver}
 %patch1 -p1
 %patch3 -p1
 %patch5 -p1
 %patch6 -p1
 
 %build
-(cd %{_tmppath}; rm -Rf gradle-%{gradle_version}; unzip $RPM_SOURCE_DIR/gradle-%{gradle_version}-bin.zip)
-GRADLE_LIB_DIR=$RPM_SOURCE_DIR
+(cd %{_tmppath}; rm -Rf gradle-%{gradle_version}; unzip %{_sourcedir}/gradle-%{gradle_version}-bin.zip)
+GRADLE_LIB_DIR=%{_sourcedir}
 export GRADLE_LIB_DIR
 %{_tmppath}/gradle-%{gradle_version}/bin/gradle copyDeps build --info