diff --git a/NEWS b/NEWS
index f17b1ca51e..c954d5821d 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Copyright (C) 2010 Splitted-Desktop Systems
 Version 0.1.1 - DD.Mar.2010
 * Document public API for libgstvaapi-*.so.*
 * Optimize `vaapiconvert' pipeline (direct-rendering)
+* Allow `vaapisink` to render videos in fullscreen mode
 
 Version 0.1.0 - 16.Mar.2010
 * Initial release
diff --git a/sys/vaapisink/gstvaapisink.c b/sys/vaapisink/gstvaapisink.c
index 65591ebc95..8a6d1d677b 100644
--- a/sys/vaapisink/gstvaapisink.c
+++ b/sys/vaapisink/gstvaapisink.c
@@ -65,6 +65,7 @@ enum {
 
     PROP_DISPLAY,
     PROP_DISPLAY_NAME,
+    PROP_FULLSCREEN
 };
 
 static GstVaapiDisplay *
@@ -140,6 +141,7 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
 {
     GstVaapiSink * const sink = GST_VAAPISINK(base_sink);
     GstStructure * const structure = gst_caps_get_structure(caps, 0);
+    GstVideoRectangle * const win_rect = &sink->window_rect;
     guint num, den;
     guint win_width, win_height;
     guint display_width, display_height, display_par_n, display_par_d;
@@ -186,7 +188,8 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
     win_ratio = (gdouble)win_width / win_height;
     GST_DEBUG("scaling to %ux%u", win_width, win_height);
 
-    if (win_width > display_width || win_height > display_height) {
+    if (sink->fullscreen ||
+        win_width > display_width || win_height > display_height) {
         if (video_width > video_height) {
             win_width  = display_width;
             win_height = display_width / win_ratio;
@@ -198,6 +201,17 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
     }
     GST_DEBUG("window size %ux%u", win_width, win_height);
 
+    if (sink->fullscreen) {
+        win_rect->x = (display_width - win_width) / 2;
+        win_rect->y = (display_height - win_height) / 2;
+    }
+    else {
+        win_rect->x = 0;
+        win_rect->y = 0;
+    }
+    win_rect->w = win_width;
+    win_rect->h = win_height;
+
     if (sink->window)
         gst_vaapi_window_set_size(sink->window, win_width, win_height);
     else {
@@ -207,6 +221,7 @@ gst_vaapisink_set_caps(GstBaseSink *base_sink, GstCaps *caps)
         );
         if (!sink->window)
             return FALSE;
+        gst_vaapi_window_set_fullscreen(sink->window, sink->fullscreen);
         gst_vaapi_window_show(sink->window);
     }
     return TRUE;
@@ -228,7 +243,8 @@ gst_vaapisink_show_frame(GstBaseSink *base_sink, GstBuffer *buffer)
         return GST_FLOW_UNEXPECTED;
 
     flags = GST_VAAPI_PICTURE_STRUCTURE_FRAME;
-    if (!gst_vaapi_window_put_surface(sink->window, surface, NULL, NULL, flags))
+    if (!gst_vaapi_window_put_surface(sink->window, surface, NULL,
+                                      &sink->window_rect, flags))
         return GST_FLOW_UNEXPECTED;
 
     return GST_FLOW_OK;
@@ -257,6 +273,9 @@ gst_vaapisink_set_property(
         g_free(sink->display_name);
         sink->display_name = g_strdup(g_value_get_string(value));
         break;
+    case PROP_FULLSCREEN:
+        sink->fullscreen = g_value_get_boolean(value);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -280,6 +299,9 @@ gst_vaapisink_get_property(
     case PROP_DISPLAY_NAME:
         g_value_set_string(value, sink->display_name);
         break;
+    case PROP_FULLSCREEN:
+        g_value_set_boolean(value, sink->fullscreen);
+        break;
     default:
         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
         break;
@@ -330,12 +352,22 @@ static void gst_vaapisink_class_init(GstVaapiSinkClass *klass)
                              "X11 display name",
                              "",
                              G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+    g_object_class_install_property
+        (object_class,
+         PROP_FULLSCREEN,
+         g_param_spec_boolean("fullscreen",
+                              "Fullscreen",
+                              "Requests window in fullscreen state",
+                              FALSE,
+                              G_PARAM_READWRITE));
 }
 
 static void gst_vaapisink_init(GstVaapiSink *sink, GstVaapiSinkClass *klass)
 {
     sink->display_name  = NULL;
     sink->display       = NULL;
+    sink->fullscreen    = FALSE;
 }
 
 GstVaapiDisplay *
diff --git a/sys/vaapisink/gstvaapisink.h b/sys/vaapisink/gstvaapisink.h
index bc04bfac40..8f271917b7 100644
--- a/sys/vaapisink/gstvaapisink.h
+++ b/sys/vaapisink/gstvaapisink.h
@@ -62,6 +62,8 @@ struct _GstVaapiSink {
     gchar              *display_name;
     GstVaapiDisplay    *display;
     GstVaapiWindow     *window;
+    GstVideoRectangle   window_rect;
+    guint               fullscreen      : 1;
 };
 
 struct _GstVaapiSinkClass {