diff --git a/.devtoolset-3-eclipse-remote.metadata b/.devtoolset-3-eclipse-remote.metadata
index 64f992c..97658a2 100644
--- a/.devtoolset-3-eclipse-remote.metadata
+++ b/.devtoolset-3-eclipse-remote.metadata
@@ -1 +1 @@
-bb62d3012d42f229d352ac522fe726b2354e029c SOURCES/org.eclipse.remote-R1_0.tar.bz2
+e3207da8deed2579d22eb278d6134fa76f2a1942 SOURCES/org.eclipse.remote-R1_1_1.tar.bz2
diff --git a/.gitignore b/.gitignore
index 87a54ba..0aae472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/org.eclipse.remote-R1_0.tar.bz2
+SOURCES/org.eclipse.remote-R1_1_1.tar.bz2
diff --git a/SPECS/eclipse-remote.spec b/SPECS/eclipse-remote.spec
index 7f44b27..e5437e0 100644
--- a/SPECS/eclipse-remote.spec
+++ b/SPECS/eclipse-remote.spec
@@ -1,12 +1,11 @@
 %{?scl:%scl_package eclipse-remote}
 %{!?scl:%global pkg_name %{name}}
-%{!?maven_scl:%global maven_scl_prefix  %{nil}}
+%{?java_common_find_provides_and_requires}
 
-%global eclipse_dropin %{_datadir}/eclipse/dropins
-%global git_tag R1_0
+%global git_tag R1_1_1
 
 Name:           %{?scl_prefix}eclipse-remote
-Version:        1.0.0
+Version:        1.1.1
 Release:        1%{?dist}
 Summary:        Eclipse Remote Services plug-in
 License:        EPL
@@ -16,16 +15,13 @@ Source0:        http://git.eclipse.org/c/ptp/org.eclipse.remote.git/snapshot/org
 
 BuildArch:      noarch
 
-BuildRequires:    %{maven_scl_prefix}maven-local
-BuildRequires:    tycho
-BuildRequires:    tycho-extras
-BuildRequires:    %{?scl_prefix}feclipse-maven-plugin
-BuildRequires:    jsch
+BuildRequires:    %{?scl_prefix}tycho
+BuildRequires:    %{?scl_prefix}tycho-extras
+BuildRequires:    %{?scl_prefix_java_common}jsch
 BuildRequires:    %{?scl_prefix}eclipse-pde >= 1:4.3.2
 BuildRequires:    %{?scl_prefix}eclipse-license
-BuildRequires:    %{?scl_prefix}objectweb-asm
 
-Requires:         jsch
+Requires:         %{?scl_prefix_java_common}jsch
 Requires:         %{?scl_prefix}eclipse-platform >= 1:4.3.2
 
 %description
@@ -37,31 +33,48 @@ Remote Services provides an extensible remote services framework.
 find -name *.jar -exec rm -rf {} \;
 find -name *.class -exec rm -rf {} \;
 
+%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"}
+%pom_remove_plugin org.eclipse.tycho:tycho-packaging-plugin releng/org.eclipse.remote.build/pom.xml
+%{?scl:EOF}
+
 %build
-scl enable %{scl} - <<"EOF"
-xmvn -o clean verify -f releng/org.eclipse.remote.build/pom.xml
-EOF
+%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"}
+%mvn_build  -j -- -f releng/org.eclipse.remote.build/pom.xml
+%{?scl:EOF}
 
 %install
-scl enable %{scl} - <<"EOF"
-xmvn -o org.fedoraproject:feclipse-maven-plugin:install \
-  -Dfeatures=org.eclipse.remote \
-  -DsourceRepo=releng/org.eclipse.remote.repo/target/repository \
-  -DtargetLocation=%{buildroot}%{eclipse_dropin}/remote/eclipse
-EOF
+%{?scl:scl enable %{scl_maven} %{scl} - <<"EOF"}
+%mvn_install
+%{?scl:EOF}
 
-%files
-%doc features/org.eclipse.remote-feature/*.html
-%{eclipse_dropin}/remote
+%files -f .mfiles
+%doc features/org.eclipse.remote-feature/epl-v10.html
 
 %changelog
+* Wed Mar 04 2015 Mat Booth <mat.booth@redhat.com> - 1.1.1-1
+- Update to 1.1.1
+
+* Tue Jan 13 2015 Mat Booth <mat.booth@redhat.com> - 1.1.0-1.2
+- Related: rhbz#1175105 - Regenerate auto-provides
+
+* Tue Jan 13 2015 Mat Booth <mat.booth@redhat.com> - 1.1.0-1.1
+- Related: rhbz#1175105 - Import into DTS 3.1
+
+* Tue Sep 30 2014 Mat Booth <mat.booth@redhat.com> - 1.1.0-1
+- Update to 1.1.0
+
+* Thu Sep 25 2014 Mat Booth <mat.booth@redhat.com> - 1.0.0-3
+- Rebuild to regenerate auto requires
+
+* Fri Sep 12 2014 Mat Booth <mat.booth@redhat.com> - 1.0.0-2
+- Build/install with xmvn
+
 * Fri Jun 27 2014 Mat Booth <mat.booth@redhat.com> - 1.0.0-1
 - Update to upstream released version
 - Add BR on eclipse-license
 
-* Wed May 21 2014 Sami Wagiaalla <swagiaal@redhat.com> - 1.0.0-0.4.git19f4d9
-- Build for DTS 3
-- Import from RAWHIDE.
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-0.5.git19f4d9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
 * Wed May 07 2014 Mat Booth <mat.booth@redhat.com> - 1.0.0-0.4.git19f4d9
 - Drop requirement on jpackage-utils