diff --git a/src/main/java/org/asteriskjava/manager/action/FaxLicenseListAction.java b/src/main/java/org/asteriskjava/manager/action/FaxLicenseListAction.java
new file mode 100644
index 00000000..1dd8d560
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/action/FaxLicenseListAction.java
@@ -0,0 +1,16 @@
+package org.asteriskjava.manager.action;
+
+import org.asteriskjava.manager.event.FaxLicenseListCompleteEvent;
+import org.asteriskjava.manager.event.ResponseEvent;
+
+public final class FaxLicenseListAction extends AbstractManagerAction implements EventGeneratingAction {
+    @Override
+    public String getAction() {
+        return "FaxLicenseList";
+    }
+
+    @Override
+    public Class<? extends ResponseEvent> getActionCompleteEventClass() {
+        return FaxLicenseListCompleteEvent.class;
+    }
+}
diff --git a/src/main/java/org/asteriskjava/manager/action/FaxLicenseStatusAction.java b/src/main/java/org/asteriskjava/manager/action/FaxLicenseStatusAction.java
new file mode 100644
index 00000000..5768ded9
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/action/FaxLicenseStatusAction.java
@@ -0,0 +1,12 @@
+package org.asteriskjava.manager.action;
+
+import org.asteriskjava.manager.ExpectedResponse;
+import org.asteriskjava.manager.response.FaxLicenseStatusResponse;
+
+@ExpectedResponse(FaxLicenseStatusResponse.class)
+public final class FaxLicenseStatusAction extends AbstractManagerAction {
+    @Override
+    public String getAction() {
+        return "FaxLicenseStatus";
+    }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java
index 0df1d28a..894718ba 100644
--- a/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/FaxDocumentStatusEvent.java
@@ -41,6 +41,10 @@ public class FaxDocumentStatusEvent extends AbstractFaxEvent {
     private String remoteSid;
     private String remoteDis;
 
+    private String language;
+    private String accountCode;
+    private String linkedId;
+    private String uniqueId;
 
     public FaxDocumentStatusEvent(Object source) {
         super(source);
@@ -302,6 +306,36 @@ public void setRemoteDis(String remoteDis) {
         this.remoteDis = remoteDis;
     }
 
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
 
+    public String getLinkedId() {
+        return linkedId;
+    }
+
+    public void setLinkedId(String linkedId) {
+        this.linkedId = linkedId;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
 }
 
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxLicenseEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxLicenseEvent.java
new file mode 100644
index 00000000..184e8d0d
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/FaxLicenseEvent.java
@@ -0,0 +1,64 @@
+package org.asteriskjava.manager.event;
+
+public final class FaxLicenseEvent extends ResponseEvent {
+    private String file;
+    private String key;
+    private String product;
+    private String hostId;
+    private Integer ports;
+    private String status;
+
+    public FaxLicenseEvent(Object source) {
+        super(source);
+    }
+
+    @Override
+    public String getFile() {
+        return file;
+    }
+
+    @Override
+    public void setFile(String file) {
+        this.file = file;
+    }
+
+    public String getHostId() {
+        return hostId;
+    }
+
+    public void setHostId(String hostId) {
+        this.hostId = hostId;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public Integer getPorts() {
+        return ports;
+    }
+
+    public void setPorts(Integer ports) {
+        this.ports = ports;
+    }
+
+    public String getProduct() {
+        return product;
+    }
+
+    public void setProduct(String product) {
+        this.product = product;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxLicenseListCompleteEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxLicenseListCompleteEvent.java
new file mode 100644
index 00000000..a4167232
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/FaxLicenseListCompleteEvent.java
@@ -0,0 +1,10 @@
+package org.asteriskjava.manager.event;
+
+import org.asteriskjava.manager.AsteriskMapping;
+
+@AsteriskMapping("FaxLicenseList complete")
+public final class FaxLicenseListCompleteEvent extends ResponseEvent {
+    public FaxLicenseListCompleteEvent(Object source) {
+        super(source);
+    }
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java
index 76aa6e8b..1724fc19 100644
--- a/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/FaxStatusEvent.java
@@ -56,6 +56,11 @@ public class FaxStatusEvent extends AbstractFaxEvent {
     private String status;
     private String operation;
 
+    private String language;
+    private String accountCode;
+    private String linkedId;
+    private String uniqueId;
+
     public FaxStatusEvent(Object source) {
         super(source);
     }
@@ -494,5 +499,37 @@ public String getOperation() {
     public void setOperation(String operation) {
         this.operation = operation;
     }
+
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getLinkedId() {
+        return linkedId;
+    }
+
+    public void setLinkedId(String linkedId) {
+        this.linkedId = linkedId;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
 }
 
diff --git a/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java b/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
index 2585040d..a38c571e 100644
--- a/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/ReceiveFaxEvent.java
@@ -14,6 +14,11 @@ public class ReceiveFaxEvent extends ManagerEvent {
     private Integer transferRate;
     private String fileName;
 
+    private String language;
+    private String accountCode;
+    private String linkedId;
+    private String uniqueId;
+
     public ReceiveFaxEvent(Object source) {
         super(source);
     }
@@ -81,4 +86,36 @@ public String getFileName() {
     public void setFileName(String fileName) {
         this.fileName = fileName;
     }
+
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getLinkedId() {
+        return linkedId;
+    }
+
+    public void setLinkedId(String linkedId) {
+        this.linkedId = linkedId;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
 }
diff --git a/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java b/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java
index 6398df05..7209364c 100644
--- a/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/SendFaxEvent.java
@@ -24,6 +24,7 @@ public class SendFaxEvent extends AbstractFaxEvent {
      * Serial version identifier.
      */
     private static final long serialVersionUID = -1L;
+    private String channel;
     private String callerId;
     private String localStationId;
     private String remoteStationId;
@@ -32,11 +33,24 @@ public class SendFaxEvent extends AbstractFaxEvent {
     private String transferRate;
     private String fileName;
 
+    private String language;
+    private String accountCode;
+    private String linkedId;
+    private String uniqueId;
 
     public SendFaxEvent(Object source) {
         super(source);
     }
 
+    @Override
+    public String getChannel() {
+        return channel;
+    }
+
+    @Override
+    public void setChannel(String channel) {
+        this.channel = channel;
+    }
 
     /**
      * @return the callerId
@@ -149,6 +163,36 @@ public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
+    public String getAccountCode() {
+        return accountCode;
+    }
 
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getLinkedId() {
+        return linkedId;
+    }
+
+    public void setLinkedId(String linkedId) {
+        this.linkedId = linkedId;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
 }
 
diff --git a/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java b/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java
index 2ac0158e..26f06251 100644
--- a/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java
+++ b/src/main/java/org/asteriskjava/manager/event/T38FaxStatusEvent.java
@@ -39,6 +39,11 @@ public class T38FaxStatusEvent extends AbstractFaxEvent {
     private Integer minimumJitterSpace;
     private Integer unrecoverablePackets;
 
+    private String language;
+    private String accountCode;
+    private String linkedId;
+    private String uniqueId;
+
     public T38FaxStatusEvent(Object source) {
         super(source);
     }
@@ -271,6 +276,38 @@ public Integer getAverageRxDataRateInBps() {
         return averageRxDataRateStripped == null ? null : Integer.valueOf(averageRxDataRateStripped);
     }
 
+    public String getAccountCode() {
+        return accountCode;
+    }
+
+    public void setAccountCode(String accountCode) {
+        this.accountCode = accountCode;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getLinkedId() {
+        return linkedId;
+    }
+
+    public void setLinkedId(String linkedId) {
+        this.linkedId = linkedId;
+    }
+
+    public String getUniqueId() {
+        return uniqueId;
+    }
+
+    public void setUniqueId(String uniqueId) {
+        this.uniqueId = uniqueId;
+    }
+
     String stripUnit(String s) {
         if (s == null || s.length() == 0) {
             return null;
diff --git a/src/main/java/org/asteriskjava/manager/response/FaxLicenseStatusResponse.java b/src/main/java/org/asteriskjava/manager/response/FaxLicenseStatusResponse.java
new file mode 100644
index 00000000..f7e91ef2
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/response/FaxLicenseStatusResponse.java
@@ -0,0 +1,13 @@
+package org.asteriskjava.manager.response;
+
+public final class FaxLicenseStatusResponse extends ManagerResponse {
+    private Integer portsLicensed;
+
+    public Integer getPortsLicensed() {
+        return portsLicensed;
+    }
+
+    public void setPortsLicensed(Integer portsLicensed) {
+        this.portsLicensed = portsLicensed;
+    }
+}