diff --git a/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java b/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java
index 7df5d27e..7b786892 100644
--- a/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java
+++ b/baksmali/src/main/java/org/jf/baksmali/Adaptors/LocalDebugMethodItem.java
@@ -29,6 +29,7 @@
 package org.jf.baksmali.Adaptors;
 
 import org.jf.dexlib.Util.DebugInfoDecoder;
+import org.jf.dexlib.Util.Utf8Utils;
 
 public class LocalDebugMethodItem extends DebugMethodItem {
     private DebugInfoDecoder.Local local;
@@ -61,6 +62,6 @@ public class LocalDebugMethodItem extends DebugMethodItem {
         if (local.signature == null) {
             return null;
         }
-        return local.signature.getStringValue();
+        return Utf8Utils.escapeString(local.signature.getStringValue());
     }
 }
diff --git a/baksmali/src/main/resources/templates/baksmali.stg b/baksmali/src/main/resources/templates/baksmali.stg
index 3236cb43..8f3c3eb5 100644
--- a/baksmali/src/main/resources/templates/baksmali.stg
+++ b/baksmali/src/main/resources/templates/baksmali.stg
@@ -306,17 +306,17 @@ StartEpilogue(Epilogue) ::=
 
 StartLocal(StartLocal) ::=
 <<
-.local <Register(StartLocal.Register)>, <StartLocal.Name>:<StartLocal.Type>
+.local <Register(StartLocal.Register)>, <StartLocal.Name>:<StartLocal.Type><if(StartLocal.Signature)>,"<StartLocal.Signature>"<endif>
 >>
 
 EndLocal(EndLocal) ::=
 <<
-.end local <Register(EndLocal.Register)>       #<EndLocal.Name>:<EndLocal.Type>
+.end local <Register(EndLocal.Register)>       <if(EndLocal.Name)>#<EndLocal.Name>:<EndLocal.Type>,<if(EndLocal.Signature)>, "<EndLocal.Signature>"<endif><endif>
 >>
 
 RestartLocal(RestartLocal) ::=
 <<
-.restart local <Register(RestartLocal.Register)>       #<RestartLocal.Name>:<RestartLocal.Type>
+.restart local <Register(RestartLocal.Register)>       <if(RestartLocal.Name)>#<RestartLocal.Name>:<RestartLocal.Type>,<if(RestartLocal.Signature)>, "<RestartLocal.Signature>"<endif><endif>
 >>
 
 SetFile(SetFile) ::=