diff --git a/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
index ea1d49721eb..2e5bffd9f02 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/model/SwaggerModelSerializer.scala
@@ -220,6 +220,18 @@ object SwaggerSerializers {
 
   class ResponseMessageSerializer extends CustomSerializer[ResponseMessage](implicit formats => ({
     case json =>
+      val responseClass = (json \ "responseModel") match {
+        case e: JObject => {
+          val inner = {
+            (e \ "items" \"type").extractOrElse({
+              (e \ "items" \ "$ref").extract[String]
+            })
+          }
+          Option("%s[%s]".format((e \ "type").extract[String], inner))
+        }
+        case _ => (json \ "responseModel").extractOpt[String]
+      }
+    
       ResponseMessage(
         (json \ "code").extractOrElse(0),
         (json \ "message").extractOrElse(""),