diff --git a/components/camel/camel-sap/src/main/resources/META-INF/services/org/apache/camel/TypeConverter b/components/camel/camel-sap/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
deleted file mode 100644
index 80bbd4806..000000000
--- a/components/camel/camel-sap/src/main/resources/META-INF/services/org/apache/camel/TypeConverter
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Copyright 2013 Red Hat, Inc.
-# 
-# Red Hat licenses this file to you under the Apache License, version
-# 2.0 (the "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-# 
-#     http://www.apache.org/licenses/LICENSE-2.0
-# 
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.  See the License for the specific language governing
-# permissions and limitations under the License.
-
-# This is a workaround for the original TypeConverter file which doesn't work on JBoss 
-# The original file contains a package name, but the converter is not loaded properly.
-org.fusesource.camel.component.sap.converter.StructureConverter
diff --git a/release/jboss-as7/modules/src/main/resources/switchyard/components/camel/sap/resources/module.xml b/release/jboss-as7/modules/src/main/resources/switchyard/components/camel/sap/resources/module.xml
index 4a451078a..a9bb0c889 100644
--- a/release/jboss-as7/modules/src/main/resources/switchyard/components/camel/sap/resources/module.xml
+++ b/release/jboss-as7/modules/src/main/resources/switchyard/components/camel/sap/resources/module.xml
@@ -29,9 +29,11 @@
         <module name="org.apache.camel.core"/>
         <module name="org.fusesource.camel.sap" export="true" optional="true">
             <imports>
+                <include path="META-INF/services/org/apache/camel"/>
                 <include path="META-INF/services/org/apache/camel/component"/>
             </imports>
             <exports>
+                <include path="META-INF/services/org/apache/camel"/>
                 <include path="META-INF/services/org/apache/camel/component"/>
             </exports>
         </module>