diff --git a/src/main/java/org/asteriskjava/manager/event/HangupHandlerPushEvent.java b/src/main/java/org/asteriskjava/manager/event/HangupHandlerPushEvent.java
new file mode 100644
index 00000000..3925d4dc
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/HangupHandlerPushEvent.java
@@ -0,0 +1,78 @@
+/*
+ *  Copyright 2004-2006 Stefan Reuter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.asteriskjava.manager.event;
+
+/**
+ * A HangupHandlerPushEvent is triggered when a channel pushes a hangup handler.
+ * <p>
+ * It is implemented in <code>channel.c</code>
+ *
+ * @author srt
+ * @version $Id$
+ */
+public class HangupHandlerPushEvent extends AbstractChannelStateEvent {
+    /**
+     * Serializable version identifier.
+     */
+    static final long serialVersionUID = 0L;
+
+    private String language;
+    private String linkedId;
+
+    private String handler;
+
+    public HangupHandlerPushEvent(Object source) {
+        super(source);
+    }
+
+    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 getHandler() {
+        return handler;
+    }
+
+    public void setHandler(String handler) {
+        this.handler = handler;
+    }
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("HangupHandlerPush [language=");
+        builder.append(language);
+        builder.append(", linkedId=");
+        builder.append(linkedId);
+        builder.append(", accountCode=");
+        builder.append(accountCode);
+        builder.append("]");
+        return builder.toString();
+    }
+
+}
diff --git a/src/main/java/org/asteriskjava/manager/event/HangupHandlerRunEvent.java b/src/main/java/org/asteriskjava/manager/event/HangupHandlerRunEvent.java
new file mode 100644
index 00000000..dbdfbb48
--- /dev/null
+++ b/src/main/java/org/asteriskjava/manager/event/HangupHandlerRunEvent.java
@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2004-2006 Stefan Reuter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ */
+package org.asteriskjava.manager.event;
+
+/**
+ * A HangupHandlerRunEvent is triggered when a hangup handler is run.
+ * <p>
+ * It is implemented in <code>channel.c</code>
+ *
+ * @author srt
+ * @version $Id$
+ */
+public class HangupHandlerRunEvent extends AbstractChannelStateEvent {
+    /**
+     * Serializable version identifier.
+     */
+    static final long serialVersionUID = 0L;
+
+    private String language;
+    private String linkedId;
+    private String handler;
+
+    public HangupHandlerRunEvent(Object source) {
+        super(source);
+    }
+
+    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 getHandler() {
+        return handler;
+    }
+
+    public void setHandler(String handler) {
+        this.handler = handler;
+    }
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("HangupHandlerRun [language=");
+        builder.append(language);
+        builder.append(", linkedId=");
+        builder.append(linkedId);
+        builder.append(", accountCode=");
+        builder.append(accountCode);
+        builder.append("]");
+        return builder.toString();
+    }
+
+}