diff --git a/ext/karaf/karaf-features/src/main/resources/features.xml b/ext/karaf/karaf-features/src/main/resources/features.xml
index d4511a8c7..9736f4219 100644
--- a/ext/karaf/karaf-features/src/main/resources/features.xml
+++ b/ext/karaf/karaf-features/src/main/resources/features.xml
@@ -23,8 +23,15 @@
     <bundle>mvn:commons-codec/commons-codec/${commons.codec.version}</bundle>
     <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
     <bundle>mvn:org.codehaus.woodstox/stax2-api/${woodstox.stax2-api.version}</bundle>
-    <bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
+    <bundle>mvn:io.netty/netty-common/${netty.version}</bundle>
+    <bundle>mvn:io.netty/netty-buffer/${netty.version}</bundle>
+    <bundle>mvn:io.netty/netty-resolver/${netty.version}</bundle>
+    <bundle>mvn:io.netty/netty-transport/${netty.version}</bundle>
+    <bundle>mvn:io.netty/netty-codec/${netty.version}</bundle>
+    <bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
+    <bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle>
 
+    <bundle>mvn:com.fasterxml/aalto-xml/${aalto-xml.version}</bundle>
     <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
     <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
     <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
diff --git a/lib/server-api/pom.xml b/lib/server-api/pom.xml
index d8ff842c6..601ebd433 100644
--- a/lib/server-api/pom.xml
+++ b/lib/server-api/pom.xml
@@ -49,7 +49,6 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-codec-http</artifactId>
-      <version>4.1.16.Final</version>
     </dependency>
     <!-- Test dependencies -->
     <dependency>
@@ -84,6 +83,7 @@
             </Import-Package>
             <!-- workaround due to the current server-api server-core interdependency -->
             <DynamicImport-Package>
+              org.apache.olingo.netty.server.core,
               org.apache.olingo.server.core
             </DynamicImport-Package>
           </instructions>
diff --git a/pom.xml b/pom.xml
index 0f16b6163..c8ed6d878 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,7 @@
     <servlet.version>3.1.0</servlet.version>
     <cxf.version>3.0.0</cxf.version>
     <spring.version>4.0.6.RELEASE</spring.version>
+    <netty.version>4.1.35.Final</netty.version>
 
     <velocity.version>1.7</velocity.version>
     <maven.plugin.api.version>3.2.2</maven.plugin.api.version>
@@ -111,6 +112,11 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>io.netty</groupId>
+        <artifactId>netty-codec-http</artifactId>
+        <version>${netty.version}</version>
+      </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
diff --git a/samples/osgi/server/pom.xml b/samples/osgi/server/pom.xml
index c437c734a..774b11cf4 100644
--- a/samples/osgi/server/pom.xml
+++ b/samples/osgi/server/pom.xml
@@ -100,6 +100,7 @@ under the License.
             </Export-Package>
             <Import-Package>
               org.apache.olingo.server.api*,
+              org.apache.olingo.netty.server.api*,
               org.apache.catalina;resolution:=optional,
               org.apache.catalina.comet;resolution:=optional,
               org.eclipse.jetty.continuation;resolution:=optional,