diff --git a/.gitignore b/.gitignore
index 3ca2361..77dc04d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,5 +69,4 @@ Makefile.in
 /src/matrix-event-call-hangup.c
 /src/matrix-glib-0.0.pc
 /src/matrix-message-notice.c
-/src/matrix-message-video.c
 /src/matrix-room.c
diff --git a/src/Makefile.am b/src/Makefile.am
index f685489..716828d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -36,7 +36,6 @@ libmatrix_glib_0_0_la_VALA_SOURCES = \
 	matrix-event-call-answer.vala \
 	matrix-event-call-hangup.vala \
 	matrix-message-notice.vala \
-	matrix-message-video.vala \
 	matrix-room.vala \
 	$(NULL)
 
@@ -102,6 +101,7 @@ INST_H_SRC_FILES = \
 	matrix-message-file.h \
 	matrix-message-image.h \
 	matrix-message-audio.h \
+	matrix-message-video.h \
 	matrix-event-room-base.h \
 	matrix-event-state-base.h \
 	matrix-event-tag.h \
@@ -144,6 +144,7 @@ libmatrix_glib_0_0_la_SOURCES = \
 	matrix-message-file.c \
 	matrix-message-image.c \
 	matrix-message-audio.c \
+	matrix-message-video.c \
 	matrix-event-tag.c \
 	matrix-event-presence.c \
 	matrix-event-room-member.c \
diff --git a/src/matrix-event-types.c b/src/matrix-event-types.c
index d1a99dd..c5b6f15 100644
--- a/src/matrix-event-types.c
+++ b/src/matrix-event-types.c
@@ -34,6 +34,7 @@
 #include "matrix-message-file.h"
 #include "matrix-message-image.h"
 #include "matrix-message-audio.h"
+#include "matrix-message-video.h"
 
 /*
   Borrowed from GLib
diff --git a/src/matrix-message-video.c b/src/matrix-message-video.c
new file mode 100644
index 0000000..ca22a28
--- /dev/null
+++ b/src/matrix-message-video.c
@@ -0,0 +1,272 @@
+/*
+ * This file is part of matrix-glib-sdk
+ *
+ * matrix-glib-sdk is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * matrix-glib-sdk is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with matrix-glib-sdk. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "matrix-message-video.h"
+#include "matrix-enumtypes.h"
+#include "config.h"
+
+/**
+ * SECTION:matrix-message-video
+ * @short_description: message type representing a single video clip
+ *
+ * This is the default message handler for `m.video` messages.
+ */
+enum  {
+    PROP_0,
+    PROP_URL,
+    PROP_INFO,
+    NUM_PROPERTIES
+};
+
+static GParamSpec *matrix_message_video_properties[NUM_PROPERTIES];
+
+typedef struct {
+    gchar* _url;
+    MatrixVideoInfo* _info;
+} MatrixMessageVideoPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE(MatrixMessageVideo, matrix_message_video, MATRIX_MESSAGE_TYPE_BASE);
+
+static void
+matrix_message_video_real_from_json(MatrixMessageBase *matrix_message_base, JsonNode *json_data, GError **error)
+{
+    MatrixMessageVideoPrivate *priv;
+    JsonObject *root;
+    JsonNode *node;
+
+    g_return_if_fail (json_data != NULL);
+
+    priv = matrix_message_video_get_instance_private(MATRIX_MESSAGE_VIDEO(matrix_message_base));
+    root = json_node_get_object(json_data);
+
+    if ((node = json_object_get_member(root, "url")) != NULL) {
+        g_free(priv->_url);
+        priv->_url = g_strdup(json_node_get_string(node));
+    } else if (DEBUG) {
+        g_warning("url is missing from a m.video message");
+    }
+
+    if ((node = json_object_get_member(root, "info")) != NULL) {
+        matrix_video_info_unref(priv->_info);
+        priv->_info = matrix_video_info_new();
+        matrix_video_info_set_from_json(priv->_info, node);
+    }
+
+    MATRIX_MESSAGE_BASE_CLASS(matrix_message_video_parent_class)->from_json(matrix_message_base, json_data, error);
+}
+
+static void
+matrix_message_video_real_to_json(MatrixMessageBase *matrix_message_base, JsonNode *json_data, GError **error)
+{
+    MatrixMessageVideoPrivate *priv;
+    JsonObject *root;
+
+    g_return_if_fail (json_data != NULL);
+
+    priv = matrix_message_video_get_instance_private(MATRIX_MESSAGE_VIDEO(matrix_message_base));
+
+    if (priv->_url == NULL) {
+        g_set_error(error, MATRIX_ERROR, MATRIX_ERROR_INCOMPLETE,
+                    "Won't generate a m.video message without url");
+
+        return;
+    }
+
+    root = json_node_get_object(json_data);
+
+    json_object_set_string_member(root, "url", priv->_url);
+
+    if (priv->_info != NULL) {
+        GError *inner_error = NULL;
+        JsonNode *node = matrix_video_info_get_json_node(priv->_info, &inner_error);
+
+        if (inner_error != NULL) {
+            g_propagate_error(error, inner_error);
+
+            return;
+        }
+
+        json_object_set_member(root, "info", node);
+    }
+
+    MATRIX_MESSAGE_BASE_CLASS(matrix_message_video_parent_class)->to_json(matrix_message_base, json_data, error);
+}
+
+MatrixMessageVideo *
+matrix_message_video_construct(GType object_type)
+{
+    return (MatrixMessageVideo *)matrix_message_base_construct(object_type);
+}
+
+MatrixMessageVideo *
+matrix_message_video_new(void) {
+    return matrix_message_video_construct(MATRIX_MESSAGE_TYPE_VIDEO);
+}
+
+const gchar *
+matrix_message_video_get_url(MatrixMessageVideo *matrix_message_video)
+{
+    MatrixMessageVideoPrivate *priv;
+
+    g_return_val_if_fail(matrix_message_video != NULL, NULL);
+
+    priv = matrix_message_video_get_instance_private(matrix_message_video);
+
+    return priv->_url;
+}
+
+
+void
+matrix_message_video_set_url(MatrixMessageVideo *matrix_message_video, const gchar *url)
+{
+    MatrixMessageVideoPrivate *priv;
+
+    g_return_if_fail(matrix_message_video != NULL);
+
+    priv = matrix_message_video_get_instance_private(matrix_message_video);
+
+    if (g_strcmp0(url, priv->_url) != 0) {
+        g_free(priv->_url);
+        priv->_url = g_strdup(url);
+
+        g_object_notify_by_pspec((GObject *)matrix_message_video, matrix_message_video_properties[PROP_URL]);
+    }
+}
+
+MatrixVideoInfo *
+matrix_message_video_get_info(MatrixMessageVideo *matrix_message_video)
+{
+    MatrixMessageVideoPrivate *priv;
+
+    g_return_val_if_fail(matrix_message_video != NULL, NULL);
+
+    priv = matrix_message_video_get_instance_private(matrix_message_video);
+
+    return priv->_info;
+}
+
+void
+matrix_message_video_set_info(MatrixMessageVideo *matrix_message_video, MatrixVideoInfo *info)
+{
+    MatrixMessageVideoPrivate *priv;
+
+    g_return_if_fail(matrix_message_video != NULL);
+
+    priv = matrix_message_video_get_instance_private(matrix_message_video);
+
+    if (priv->_info != info) {
+        matrix_video_info_unref(priv->_info);
+        priv->_info = matrix_video_info_ref(info);
+
+        g_object_notify_by_pspec((GObject *)matrix_message_video, matrix_message_video_properties[PROP_INFO]);
+    }
+}
+
+static void
+matrix_message_video_finalize(GObject *gobject)
+{
+    MatrixMessageVideoPrivate *priv = matrix_message_video_get_instance_private(MATRIX_MESSAGE_VIDEO(gobject));
+
+    g_free(priv->_url);
+    matrix_video_info_unref(priv->_info);
+
+    G_OBJECT_CLASS(matrix_message_video_parent_class)->finalize(gobject);
+}
+
+static void
+matrix_message_video_get_property(GObject *gobject, guint property_id, GValue *value, GParamSpec *pspec)
+{
+    MatrixMessageVideo *matrix_message_video = MATRIX_MESSAGE_VIDEO(gobject);
+
+    switch (property_id) {
+        case PROP_URL:
+            g_value_set_string(value, matrix_message_video_get_url(matrix_message_video));
+
+            break;
+        case PROP_INFO:
+            g_value_set_boxed(value, matrix_message_video_get_info(matrix_message_video));
+
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, property_id, pspec);
+
+            break;
+    }
+}
+
+static void
+matrix_message_video_set_property(GObject *gobject, guint property_id, const GValue *value, GParamSpec *pspec)
+{
+    MatrixMessageVideo *matrix_message_video = MATRIX_MESSAGE_VIDEO(gobject);
+
+    switch (property_id) {
+        case PROP_URL:
+            matrix_message_video_set_url(matrix_message_video, g_value_get_string(value));
+
+            break;
+        case PROP_INFO:
+            matrix_message_video_set_info(matrix_message_video, g_value_get_boxed(value));
+
+            break;
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(gobject, property_id, pspec);
+
+            break;
+    }
+}
+
+static void
+matrix_message_video_class_init(MatrixMessageVideoClass *klass)
+{
+    ((MatrixMessageBaseClass *)klass)->from_json = matrix_message_video_real_from_json;
+    ((MatrixMessageBaseClass *)klass)->to_json = matrix_message_video_real_to_json;
+    G_OBJECT_CLASS(klass)->get_property = matrix_message_video_get_property;
+    G_OBJECT_CLASS(klass)->set_property = matrix_message_video_set_property;
+    G_OBJECT_CLASS(klass)->finalize = matrix_message_video_finalize;
+
+    /**
+     * MatrixMessageVideo:url:
+     *
+     * The URL to the video clip.
+     */
+    matrix_message_video_properties[PROP_URL] = g_param_spec_string(
+            "url", "url", "url",
+            NULL,
+            G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
+    g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_URL, matrix_message_video_properties[PROP_URL]);
+
+    /**
+     * MatrixMessageVideo:info:
+     *
+     * A #MatrixVideoInfo object describing #MatrixMessageVideo:url.
+     */
+    matrix_message_video_properties[PROP_INFO] = g_param_spec_boxed(
+            "info", "info", "info",
+            MATRIX_TYPE_VIDEO_INFO,
+            G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
+    g_object_class_install_property(G_OBJECT_CLASS(klass), PROP_INFO, matrix_message_video_properties[PROP_INFO]);
+}
+
+static void
+matrix_message_video_init(MatrixMessageVideo *matrix_message_video)
+{
+    MatrixMessageVideoPrivate *priv = matrix_message_video_get_instance_private(matrix_message_video);
+
+    priv->_url = NULL;
+    priv->_info = NULL;
+}
diff --git a/src/matrix-message-video.h b/src/matrix-message-video.h
new file mode 100644
index 0000000..3a2d644
--- /dev/null
+++ b/src/matrix-message-video.h
@@ -0,0 +1,44 @@
+/*
+ * This file is part of matrix-glib-sdk
+ *
+ * matrix-glib-sdk is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * matrix-glib-sdk is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with matrix-glib-sdk. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MATRIX_GLIB_SDK_MESSAGE_VIDEO_H__
+# define __MATRIX_GLIB_SDK_MESSAGE_VIDEO_H__
+
+# include <glib-object.h>
+# include "matrix-message-base.h"
+# include "matrix-types.h"
+
+G_BEGIN_DECLS
+
+# define MATRIX_MESSAGE_TYPE_VIDEO (matrix_message_video_get_type ())
+G_DECLARE_DERIVABLE_TYPE(MatrixMessageVideo, matrix_message_video, MATRIX_MESSAGE, VIDEO, MatrixMessageBase);
+
+struct _MatrixMessageVideoClass {
+    MatrixMessageBaseClass parent_class;
+};
+
+MatrixMessageVideo* matrix_message_video_new (void);
+MatrixMessageVideo* matrix_message_video_construct (GType object_type);
+const gchar* matrix_message_video_get_url (MatrixMessageVideo* self);
+void matrix_message_video_set_url (MatrixMessageVideo* self, const gchar* value);
+MatrixVideoInfo* matrix_message_video_get_info (MatrixMessageVideo* self);
+void matrix_message_video_set_info (MatrixMessageVideo* self, MatrixVideoInfo* value);
+
+G_END_DECLS
+
+#endif  /* __MATRIX_GLIB_SDK_MESSAGE_VIDEO_H__ */
diff --git a/src/matrix-message-video.vala b/src/matrix-message-video.vala
deleted file mode 100644
index 1b7fc83..0000000
--- a/src/matrix-message-video.vala
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * This file is part of matrix-glib-sdk
- *
- * matrix-glib-sdk is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation, either
- * version 3 of the License, or (at your option) any later version.
- *
- * matrix-glib-sdk is distributed in the hope that it will be
- * useful, but WITHOUT ANY WARRANTY; without even the implied
- * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with matrix-glib-sdk. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-
-/**
- * This message represents a single video clip.
- */
-public class Matrix.Message.Video : Matrix.Message.Base {
-    /**
-     * The URL to the video clip.
-     */
-    public string? url { get; set; default = null; }
-
-    /**
-     * Metadata about the video clip referred to in `url`.
-     */
-    public VideoInfo? info { get; set; default = null; }
-
-    protected override void
-    from_json(Json.Node json_data)
-        throws Matrix.Error
-    {
-        var root = json_data.get_object();
-        Json.Node? node;
-
-        if ((node = root.get_member("url")) != null) {
-            _url = node.get_string();
-        } else if (Config.DEBUG) {
-            warning("url is missing from a m.video message");
-        }
-
-        if ((node = root.get_member("info")) != null) {
-            _info = VideoInfo();
-            _info.set_from_json(node);
-        }
-
-        base.from_json(json_data);
-    }
-
-    protected override void
-    to_json(Json.Node json_data)
-        throws Matrix.Error
-    {
-        if (_url == null) {
-            throw new Matrix.Error.INCOMPLETE(
-                    "Won't generate a m.video message without url");
-        }
-
-        var root = json_data.get_object();
-
-        root.set_string_member("url", _url);
-
-        if (_info != null) {
-            root.set_member("info", _info.get_json_node());
-        }
-
-        base.to_json(json_data);
-    }
-}
diff --git a/vapi/c-api.vapi b/vapi/c-api.vapi
index 0c5bb83..e83cca5 100644
--- a/vapi/c-api.vapi
+++ b/vapi/c-api.vapi
@@ -768,5 +768,19 @@ namespace Matrix {
             to_json(Json.Node json_data)
             throws Matrix.Error;
         }
+
+        [CCode (cheader_filename = "matrix-message-video.h")]
+        public class Video : Base {
+            public string? url { get; set; default = null; }
+            public Matrix.VideoInfo? info { get; set; default = null; }
+
+            protected override void
+            from_json(Json.Node json_data)
+            throws Matrix.Error;
+
+            protected override void
+            to_json(Json.Node json_data)
+            throws Matrix.Error;
+        }
     }
 }