diff --git a/all/pom.xml b/all/pom.xml
index fb09eadd9a..49d6731264 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -119,6 +119,20 @@
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec-dns</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec-haproxy</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>netty-codec-http</artifactId>
@@ -128,14 +142,14 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netty-codec-socks</artifactId>
+      <artifactId>netty-codec-memcache</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>netty-codec-memcache</artifactId>
+      <artifactId>netty-codec-socks</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
       <optional>true</optional>
diff --git a/codec-haproxy/pom.xml b/codec-haproxy/pom.xml
new file mode 100644
index 0000000000..0d1c876a14
--- /dev/null
+++ b/codec-haproxy/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2012 The Netty Project
+  ~
+  ~ The Netty Project 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>io.netty</groupId>
+    <artifactId>netty-parent</artifactId>
+    <version>5.0.0.Alpha2-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>netty-codec-haproxy</artifactId>
+  <packaging>jar</packaging>
+
+  <name>Netty/Codec/HAProxy</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>netty-codec</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
+
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolCommand.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolCommand.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolCommand.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolCommand.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoder.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoder.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoder.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoder.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolException.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolException.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolException.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolException.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolMessage.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolMessage.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolMessage.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolMessage.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolVersion.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolVersion.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolVersion.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/HAProxyProtocolVersion.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/ProxiedAddressFamily.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/ProxiedAddressFamily.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/ProxiedAddressFamily.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/ProxiedAddressFamily.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/ProxiedProtocolAndFamily.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/ProxiedProtocolAndFamily.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/ProxiedProtocolAndFamily.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/ProxiedProtocolAndFamily.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/ProxiedTransportProtocol.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/ProxiedTransportProtocol.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/ProxiedTransportProtocol.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/ProxiedTransportProtocol.java
diff --git a/codec/src/main/java/io/netty/handler/codec/haproxy/package-info.java b/codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/package-info.java
similarity index 100%
rename from codec/src/main/java/io/netty/handler/codec/haproxy/package-info.java
rename to codec-haproxy/src/main/java/io/netty/handler/codec/haproxy/package-info.java
diff --git a/codec/src/test/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoderTest.java b/codec-haproxy/src/test/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoderTest.java
similarity index 99%
rename from codec/src/test/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoderTest.java
rename to codec-haproxy/src/test/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoderTest.java
index c39359fef0..f91b143d46 100644
--- a/codec/src/test/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoderTest.java
+++ b/codec-haproxy/src/test/java/io/netty/handler/codec/haproxy/HAProxyProtocolDecoderTest.java
@@ -15,11 +15,9 @@
  */
 package io.netty.handler.codec.haproxy;
 
-import io.netty.buffer.ByteBuf;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.util.CharsetUtil;
-
 import org.junit.Before;
 import org.junit.Test;
 
diff --git a/pom.xml b/pom.xml
index 0526da3def..feb92f236d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,6 +336,7 @@
     <module>buffer</module>
     <module>codec</module>
     <module>codec-dns</module>
+    <module>codec-haproxy</module>
     <module>codec-http</module>
     <module>codec-memcache</module>
     <module>codec-stomp</module>