diff --git a/felix-gogo-runtime.spec b/felix-gogo-runtime.spec
index dd641bd..c94d7e7 100644
--- a/felix-gogo-runtime.spec
+++ b/felix-gogo-runtime.spec
@@ -1,12 +1,6 @@
-%global project   felix
-%global bundle    org.apache.felix.gogo.runtime
-
-%{!?scl:%global pkg_name %{name}}
-%{?scl:%scl_package %{project}-gogo-runtime}
-
-Name:           %{?scl_prefix}%{project}-gogo-runtime
+Name:           felix-gogo-runtime
 Version:        0.16.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Community OSGi R4 Service Platform Implementation - Basic Commands
 License:        ASL 2.0
 URL:            http://felix.apache.org/site/apache-felix-gogo.html
@@ -16,13 +10,13 @@ Source0:        http://www.apache.org/dist/felix/org.apache.felix.gogo.runtime-%
 # Typecast an Event constructor call with java.util.Properties to 
 # java.util.Dictionary because the call to the constructor with Properties
 # was ambiguous.
-Patch1:         %{pkg_name}-dictionary.patch
+Patch1:         felix-gogo-runtime-dictionary.patch
 # Changed path to DEPENDENCIES, LICENSE and NOTICE from META-INF to root dir
-Patch2:         %{pkg_name}-bundle-resources.patch
+Patch2:         felix-gogo-runtime-bundle-resources.patch
 # Removed failing thread IO test
-Patch3:         %{pkg_name}-deleted-io-test.patch
+Patch3:         felix-gogo-runtime-deleted-io-test.patch
 # Removed relativePath to parent pom
-Patch4:         %{pkg_name}-parent.patch
+Patch4:         felix-gogo-runtime-parent.patch
 
 BuildArch:      noarch
 
@@ -34,10 +28,6 @@ BuildRequires:  mvn(org.mockito:mockito-all)
 BuildRequires:  mvn(org.osgi:org.osgi.compendium)
 BuildRequires:  mvn(org.osgi:org.osgi.core)
 
-%{?scl:BuildRequires:	  %{?scl_prefix}build}
-
-%{?scl:Requires: %scl_runtime}
-
 %description
 Apache Felix is a community effort to implement the OSGi R4 Service Platform
 and other interesting OSGi-related technologies under the Apache license. The
@@ -54,30 +44,30 @@ Summary:        Javadoc for %{name}
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{bundle}-%{version}
+%setup -q -n org.apache.felix.gogo.runtime-%{version}
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
-%mvn_file : %{project}/%{name}
+%mvn_file : felix/%{name}
 
 %build
-%{?scl:%scl_maven_opts}
 %mvn_build -f
 
 %install
 %mvn_install
 
-
 %files -f .mfiles
-%dir %{_javadir}/%{project}
 %doc DEPENDENCIES LICENSE NOTICE 
 
 %files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Mon Jun 29 2015 Mat Booth <mat.booth@redhat.com> - 0.16.2-2
+- Remove incomplete and forbidden SCL macros
+
 * Fri Jun 19 2015 Alexander Kurtakov <akurtako@redhat.com> 0.16.2-1
 - Update to upstream 0.16.2.