diff --git a/build.sbt b/build.sbt
index 476a65e7d..1e68e2b1f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -8,8 +8,8 @@ lazy val commonSettings = Seq(
     "com.typesafe.akka"          %% "akka-actor"    % "2.4.4",
     "com.typesafe.scala-logging" %% "scala-logging" % "3.1.0",
     "org.specs2"                 %% "specs2-core"   % "3.8.3" % "test",
-    "org.scodec"                 %% "scodec-core"   % "1.9.0",
-    "org.scodec"                 %% "scodec-akka"   % "0.1.0",
+    "org.scodec"                 %% "scodec-core"   % "1.10.0",
+    "org.scodec"                 %% "scodec-akka"   % "0.2.0",
     "net.java.dev.jna"            % "jna"           % "4.2.1",
     "com.typesafe.akka"          %% "akka-slf4j"    % "2.4.4",
     "ch.qos.logback"              % "logback-classic" % "1.1.7",
diff --git a/pslogin/src/main/scala/UdpListener.scala b/pslogin/src/main/scala/UdpListener.scala
index 029bbaf05..dfc47c6f5 100644
--- a/pslogin/src/main/scala/UdpListener.scala
+++ b/pslogin/src/main/scala/UdpListener.scala
@@ -41,8 +41,7 @@ class UdpListener(nextActorProps : Props, nextActorName : String, address : Inet
   def ready(socket: ActorRef): Receive = {
     case SendPacket(msg, to) =>
       bytesSent += msg.size
-      // XXX: revert back to msg.toByteString when scodec-akka is unbroken... (this is doing a copy)
-      socket ! Udp.Send(ByteString(msg.toByteBuffer), to)
+      socket ! Udp.Send(msg.toByteString, to)
     case Udp.Received(data, remote) =>
       bytesRecevied += data.size
       nextActor ! ReceivedPacket(data.toByteVector, remote)