diff --git a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
index 6fa24eb..4e15672 100644
--- a/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
+++ b/Common/src/com/googlecode/android_scripting/jsonrpc/JsonBuilder.java
@@ -114,7 +114,7 @@
             return buildJsonAddress((Address) data);
         }
         if (data instanceof AudioState) {
-            // TODO: fill this in.
+            return buildJsonAudioState((AudioState) data);
         }
         if (data instanceof Location) {
             return buildJsonLocation((Location) data);
@@ -222,6 +222,13 @@
         // throw new JSONException("Failed to build JSON result. " + data.getClass().getName());
     }
 
+    private static JSONObject buildJsonAudioState(AudioState data) throws JSONException {
+        JSONObject state = new JSONObject();
+        state.put("isMuted", data.isMuted());
+        state.put("AudioRoute", AudioState.audioRouteToString(data.getRoute()));
+        return state;
+    }
+
     private static Object buildDisplayMetrics(DisplayMetrics data) throws JSONException {
         JSONObject dm = new JSONObject();
         dm.put("widthPixels", data.widthPixels);